diff options
| author | Luca Deri <deri@ntop.org> | 2019-07-02 23:25:55 +0200 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2019-07-02 23:25:55 +0200 |
| commit | cc15389729adc36541a4300a2132574d38c8858e (patch) | |
| tree | 36f171a870496c51e4f3c5d753025e2237a4cb53 | |
| parent | edd4f2e37dc23cf2515c4efa395d55240a67d936 (diff) | |
Improved protocol guess
| -rw-r--r-- | src/lib/ndpi_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 00dec6eef..d5e9c87e1 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -5499,7 +5499,7 @@ ndpi_protocol ndpi_guess_undetected_protocol(struct ndpi_detection_module_struct u_int8_t user_defined_proto; if((proto == IPPROTO_TCP) || (proto == IPPROTO_UDP)) { - rc = ndpi_search_tcp_or_udp_raw(ndpi_struct, NULL, proto, shost, dhost, sport, dport); + rc = ndpi_search_tcp_or_udp_raw(ndpi_struct, flow, proto, shost, dhost, sport, dport); if(rc != NDPI_PROTOCOL_UNKNOWN) { if(flow && (proto == IPPROTO_UDP) @@ -5508,7 +5508,7 @@ ndpi_protocol ndpi_guess_undetected_protocol(struct ndpi_detection_module_struct ; else { ret.app_protocol = rc, - ret.master_protocol = ndpi_guess_protocol_id(ndpi_struct, NULL, proto, sport, + ret.master_protocol = ndpi_guess_protocol_id(ndpi_struct, flow, proto, sport, dport, &user_defined_proto); if(ret.app_protocol == ret.master_protocol) @@ -5519,7 +5519,7 @@ ndpi_protocol ndpi_guess_undetected_protocol(struct ndpi_detection_module_struct } } - rc = ndpi_guess_protocol_id(ndpi_struct, NULL, proto, sport, dport, &user_defined_proto); + rc = ndpi_guess_protocol_id(ndpi_struct, flow, proto, sport, dport, &user_defined_proto); if(rc != NDPI_PROTOCOL_UNKNOWN) { if(flow && (proto == IPPROTO_UDP) && NDPI_COMPARE_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, rc) @@ -5547,7 +5547,7 @@ ndpi_protocol ndpi_guess_undetected_protocol(struct ndpi_detection_module_struct ret.app_protocol = NDPI_PROTOCOL_SKYPE; } } else - ret.app_protocol = ndpi_guess_protocol_id(ndpi_struct, NULL, proto, sport, + ret.app_protocol = ndpi_guess_protocol_id(ndpi_struct, flow, proto, sport, dport, &user_defined_proto); ret.category = ndpi_get_proto_category(ndpi_struct, ret); |