diff options
| author | Luca <deri@ntop.org> | 2019-10-29 19:45:15 +0100 |
|---|---|---|
| committer | Luca <deri@ntop.org> | 2019-10-29 19:45:15 +0100 |
| commit | af01e61c89a66630fdc76e5059c0a348226e6f40 (patch) | |
| tree | 4e9d3883da5610e746f69d0a3a7f79eb47fd9b7c /src/lib/ndpi_main.c | |
| parent | 6e314ea6d7bea4809a5f0c7a66074251913e6942 (diff) | |
Fixed invalid guess with the top defined protocol
Diffstat (limited to 'src/lib/ndpi_main.c')
| -rw-r--r-- | src/lib/ndpi_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index ef231a68d..ac8364761 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1769,8 +1769,6 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 5246, 5247, 0, 0, 0) /* UDP */ ); - - /* TODO: Needs a pcap file for Zabbix */ ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_ZABBIX, 1 /* no subprotocol */, no_master, no_master, "Zabbix", NDPI_PROTOCOL_CATEGORY_NETWORK, @@ -4688,7 +4686,7 @@ ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct } else flow->guessed_header_category = NDPI_PROTOCOL_CATEGORY_UNSPECIFIED; - if(flow->guessed_protocol_id >= (NDPI_MAX_SUPPORTED_PROTOCOLS-1)) { + if(flow->guessed_protocol_id > NDPI_MAX_SUPPORTED_PROTOCOLS) { /* This is a custom protocol and it has priority over everything else */ ret.master_protocol = NDPI_PROTOCOL_UNKNOWN, ret.app_protocol = flow->guessed_protocol_id ? flow->guessed_protocol_id : flow->guessed_host_protocol_id; @@ -4724,7 +4722,7 @@ ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct } } - if(flow->guessed_host_protocol_id >= (NDPI_MAX_SUPPORTED_PROTOCOLS-1)) { + if(flow->guessed_host_protocol_id > NDPI_MAX_SUPPORTED_PROTOCOLS) { /* This is a custom protocol and it has priority over everything else */ ret.master_protocol = NDPI_PROTOCOL_UNKNOWN, ret.app_protocol = flow->guessed_host_protocol_id; |