diff options
| author | Vito Piserchia <vito.piserchia@dreamlab.net> | 2016-10-13 13:50:29 +0200 |
|---|---|---|
| committer | Vito Piserchia <vito.piserchia@dreamlab.net> | 2016-10-13 13:50:29 +0200 |
| commit | 4c467d7cad5b352c692b6e73b43e6d23325b4b38 (patch) | |
| tree | 045721c039d518c3d32e6dc88d7c9780ee10da95 /src/lib/ndpi_main.c | |
| parent | a17553cbf1c7dd1bb92e83d800e6904d159fc016 (diff) | |
| parent | db794beb84331f1f15f68b4685c6b87e56560597 (diff) | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'src/lib/ndpi_main.c')
| -rw-r--r-- | src/lib/ndpi_main.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 749a740b4..14e0ee387 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -843,11 +843,6 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp no_master, "Filetopia", ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_IMESH, - no_master, - no_master, "iMESH", - ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, - ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_KONTIKI, no_master, no_master, "Kontiki", @@ -2274,9 +2269,6 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n /* VMWARE */ init_vmware_dissector(ndpi_struct, &a, detection_bitmask); - /* IMESH */ - init_imesh_dissector(ndpi_struct, &a, detection_bitmask); - /* MMS */ init_mms_dissector(ndpi_struct, &a, detection_bitmask); |