diff options
| -rw-r--r-- | example/reader_util.c | 15 | ||||
| -rw-r--r-- | src/include/ndpi_typedefs.h | 14 |
2 files changed, 26 insertions, 3 deletions
diff --git a/example/reader_util.c b/example/reader_util.c index 82251e85d..0b4e6c2c8 100644 --- a/example/reader_util.c +++ b/example/reader_util.c @@ -664,9 +664,11 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow l4_offset = iph->ihl * 4; l3 = (const u_int8_t*)iph; + *proto = iph->protocol; } else { l4_offset = sizeof(struct ndpi_ipv6hdr); l3 = (const u_int8_t*)iph6; + *proto = iph6->ip6_hdr.ip6_un1_nxt; } if(l4_packet_len < 64) @@ -685,10 +687,9 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow if(l4_packet_len > workflow->stats.max_packet_len) workflow->stats.max_packet_len = l4_packet_len; - *proto = iph->protocol; l4 = ((const u_int8_t *) l3 + l4_offset); - if(iph->protocol == IPPROTO_TCP && l4_packet_len >= 20) { + if(*proto == IPPROTO_TCP && l4_packet_len >= sizeof(struct ndpi_tcphdr)) { u_int tcp_len; // tcp @@ -699,7 +700,7 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow *payload = (u_int8_t*)&l4[tcp_len]; *payload_len = ndpi_max(0, l4_packet_len-4*(*tcph)->doff); l4_data_len = l4_packet_len - sizeof(struct ndpi_tcphdr); - } else if(iph->protocol == IPPROTO_UDP && l4_packet_len >= 8) { + } else if(*proto == IPPROTO_UDP && l4_packet_len >= sizeof(struct ndpi_udphdr)) { // udp workflow->stats.udp_count++; @@ -708,6 +709,14 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow *payload = (u_int8_t*)&l4[sizeof(struct ndpi_udphdr)]; *payload_len = (l4_packet_len > sizeof(struct ndpi_udphdr)) ? l4_packet_len-sizeof(struct ndpi_udphdr) : 0; l4_data_len = l4_packet_len - sizeof(struct ndpi_udphdr); + } else if(*proto == IPPROTO_ICMP) { + *payload = (u_int8_t*)&l4[sizeof(struct ndpi_icmphdr )]; + *payload_len = (l4_packet_len > sizeof(struct ndpi_icmphdr)) ? l4_packet_len-sizeof(struct ndpi_icmphdr) : 0; + l4_data_len = l4_packet_len - sizeof(struct ndpi_icmphdr); + } else if (*proto == IPPROTO_ICMPV6) { + *payload = (u_int8_t*)&l4[sizeof(struct ndpi_icmp6hdr)]; + *payload_len = (l4_packet_len > sizeof(struct ndpi_icmp6hdr)) ? l4_packet_len-sizeof(struct ndpi_icmp6hdr) : 0; + l4_data_len = l4_packet_len - sizeof(struct ndpi_icmp6hdr); } else { // non tcp/udp protocols *sport = *dport = 0; diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 1f14cb2ad..4d322e5e1 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -348,6 +348,20 @@ struct ndpi_icmphdr { } un; } PACK_OFF; +/* +++++++++++++++++++++++ ICMP6 header +++++++++++++++++++++++ */ + +PACK_ON +struct ndpi_icmp6hdr { + uint8_t icmp6_type; /* type field */ + uint8_t icmp6_code; /* code field */ + uint16_t icmp6_cksum; /* checksum field */ + union { + uint32_t icmp6_un_data32[1]; /* type-specific field */ + uint16_t icmp6_un_data16[2]; /* type-specific field */ + uint8_t icmp6_un_data8[4]; /* type-specific field */ + } icmp6_dataun; +} PACK_OFF; + /* +++++++++++++++++++++++ VXLAN header +++++++++++++++++++++++ */ PACK_ON |