diff options
| author | Luca Deri <deri@ntop.org> | 2015-08-18 11:02:29 +0200 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2015-08-18 11:02:29 +0200 |
| commit | 41fcb7b1c182f364a335abc127910a399fdfb2b0 (patch) | |
| tree | 109577e448f4f3e6bec1b984d2a07a79e9b4c6c6 /src | |
| parent | a0bef995b68d1825c6e9a19fcbf604ef76580c51 (diff) | |
Warning fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ndpi_main.c | 4 | ||||
| -rw-r--r-- | src/lib/protocols/eaq.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 9514a5943..c4b214448 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -773,7 +773,7 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp int i; ndpi_port_range ports_a[MAX_DEFAULT_PORTS], ports_b[MAX_DEFAULT_PORTS]; u_int16_t no_master[2] = { NDPI_PROTOCOL_NO_MASTER_PROTO, NDPI_PROTOCOL_NO_MASTER_PROTO }, - custom_master[2], custom_master1[2]; + custom_master[2]; /* Reset all settings */ memset(ndpi_mod->proto_defaults, 0, sizeof(ndpi_mod->proto_defaults)); @@ -3425,7 +3425,7 @@ ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct /* Swap proocols in case of success */ if(ret.master_protocol != NDPI_PROTOCOL_UNKNOWN) { - u_int8_t t = ret.master_protocol; + u_int16_t t = ret.master_protocol; ret.master_protocol = ret.protocol; ret.protocol = t; diff --git a/src/lib/protocols/eaq.c b/src/lib/protocols/eaq.c index 7dfc5f778..96ecacdde 100644 --- a/src/lib/protocols/eaq.c +++ b/src/lib/protocols/eaq.c @@ -39,8 +39,6 @@ static void ndpi_int_eaq_add_connection(struct ndpi_detection_module_struct *ndp void ndpi_search_eaq(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { struct ndpi_packet_struct *packet = &flow->packet; u_int16_t sport = ntohs(packet->udp->source), dport = ntohs(packet->udp->dest); - unsigned char *vers; - int ver_offs; if((packet->payload_packet_len != EAQ_DEFAULT_SIZE) || ((sport != EAQ_DEFAULT_PORT) && (dport != EAQ_DEFAULT_PORT))) { |