Removed now obsolete NDPI_DETECTION_SUPPORT_IPV6: code is more readeable now

This commit is contained in:
Luca Deri
2021-02-10 19:09:11 +01:00
parent 76ac551ed3
commit ea0309d21b
10 changed files with 19 additions and 102 deletions
-2
View File
@@ -290,9 +290,7 @@ static int search_valid_dns(struct ndpi_detection_module_struct *ndpi_struct,
}
if((((rsp_type == 0x1) && (data_len == 4)) /* A */
#ifdef NDPI_DETECTION_SUPPORT_IPV6
|| ((rsp_type == 0x1c) && (data_len == 16)) /* AAAA */
#endif
)) {
memcpy(&flow->protos.dns.rsp_addr, flow->packet.payload + x, data_len);
}
-2
View File
@@ -43,9 +43,7 @@ void ndpi_search_in_non_tcp_udp(struct ndpi_detection_module_struct
struct ndpi_packet_struct *packet = &flow->packet;
if (packet->iph == NULL) {
#ifdef NDPI_DETECTION_SUPPORT_IPV6
if (packet->iphv6 == NULL)
#endif
return;
}
-4
View File
@@ -73,11 +73,7 @@ void ndpi_search_tcp_or_udp(struct ndpi_detection_module_struct *ndpi_struct, st
proto = ndpi_search_tcp_or_udp_raw(ndpi_struct,
flow,
flow->packet.iph ? flow->packet.iph->protocol :
#ifdef NDPI_DETECTION_SUPPORT_IPV6
flow->packet.iphv6->ip6_hdr.ip6_un1_nxt,
#else
0,
#endif
ntohl(packet->iph->saddr),
ntohl(packet->iph->daddr),
sport, dport);
-2
View File
@@ -37,10 +37,8 @@ void ndpi_search_wsd(struct ndpi_detection_module_struct *ndpi_struct,
if(packet->udp
&& (
(packet->iph && ((ntohl(packet->iph->daddr) & 0xF0000000) == 0xE0000000 /* A multicast address */))
#ifdef NDPI_DETECTION_SUPPORT_IPV6
||
(packet->iphv6 && ntohl(packet->iphv6->ip6_dst.u6_addr.u6_addr32[0]) == 0xFF020000)
#endif
)
&& (ntohs(packet->udp->dest) == WSD_PORT)
&& (packet->payload_packet_len >= 40)