diff options
| author | Campus <campus@ntop.org> | 2016-11-13 18:45:50 +0100 |
|---|---|---|
| committer | Campus <campus@ntop.org> | 2016-11-13 18:45:50 +0100 |
| commit | d86e5047799ffc667120a288c15de30996af37a5 (patch) | |
| tree | 1a573770eaf5e8eb99287962b7d7bb8ef037c5ec /src/lib/ndpi_main.c | |
| parent | 2005979f46528fc078986dc5d240279bffe2daaf (diff) | |
| parent | 3d6b4d4dffaef67d9f49380a39a248e7b7756da4 (diff) | |
Merge branch 'alagoutte-warning' into dev
Diffstat (limited to 'src/lib/ndpi_main.c')
| -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 d1f522e84..50a234b2f 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1927,8 +1927,6 @@ static ndpi_default_ports_tree_node_t* ndpi_get_guessed_protocol_id(struct ndpi_ u_int16_t ndpi_guess_protocol_id(struct ndpi_detection_module_struct *ndpi_struct, u_int8_t proto, u_int16_t sport, u_int16_t dport, u_int8_t *user_defined_proto) { - const void *ret; - ndpi_default_ports_tree_node_t node; *user_defined_proto = 0; /* Default */ if(sport && dport) { @@ -3489,14 +3487,13 @@ ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct flow->packet.iph)) { u_int16_t sport, dport; u_int8_t protocol; - u_int32_t saddr, daddr; u_int8_t user_defined_proto; flow->protocol_id_already_guessed = 1; #ifdef NDPI_DETECTION_SUPPORT_IPV6 if(flow->packet.iphv6 != NULL) { - protocol = flow->packet.iphv6->ip6_ctlun.ip6_un1.ip6_un1_nxt, saddr = 0, daddr = 0; + protocol = flow->packet.iphv6->ip6_ctlun.ip6_un1.ip6_un1_nxt; } else #endif { @@ -4467,6 +4464,9 @@ const char* ndpi_category_str(ndpi_protocol_category_t category) { case NDPI_PROTOCOL_CATEGORY_SYSTEM: return("System"); break; + case NDPI_PROTOCOL_CATEGORY_UNSPECIFIED: + return("Unspecified"); + break; } return("Unspecified"); |