diff options
| author | Sorin Zamfir <zamfir.sorin@yahoo.com> | 2016-03-20 11:52:57 +0200 |
|---|---|---|
| committer | Sorin Zamfir <sorin.zamfir@elektrobit.com> | 2016-03-20 11:53:27 +0200 |
| commit | 6f428c03e22d5e6667c857e06146f1e8b4ed8f53 (patch) | |
| tree | 5638502cbf1e59b260bcdc4a8da95cd15427dd74 /src/lib/ndpi_main.c | |
| parent | 5349d33abf7bb9d23b6209c581773e0b967445a4 (diff) | |
| parent | 2d5d39db7bdaefc424caab7ec334371dd1f181bf (diff) | |
Merge remote-tracking branch 'remotes/iot/dev' into dev
Conflicts:
src/include/ndpi_protocol_ids.h
src/lib/ndpi_main.c
Diffstat (limited to 'src/lib/ndpi_main.c')
| -rw-r--r-- | src/lib/ndpi_main.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index a5fab256e..8d40fe9aa 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1523,6 +1523,16 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp no_master, "Viber", ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0), /* TCP */ ndpi_build_default_ports(ports_b, 7985, 7987, 0, 0, 0)); /* UDP */ + ndpi_set_proto_defaults(ndpi_mod,NDPI_PROTOCOL_ACCEPTABLE,NDPI_PROTOCOL_COAP, + no_master, + no_master, "COAP", + ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0), /* TCP */ + ndpi_build_default_ports(ports_b, 5683, 5684, 0, 0, 0)); /* UDP */ + ndpi_set_proto_defaults(ndpi_mod,NDPI_PROTOCOL_ACCEPTABLE,NDPI_PROTOCOL_MQTT, + no_master, + no_master, "MQTT", + ndpi_build_default_ports(ports_a, 1883, 8883, 0, 0, 0), /* TCP */ + ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0)); /* UDP */ /* calling function for host and content matched protocols */ init_string_based_protocols(ndpi_mod); @@ -2487,6 +2497,12 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n /* UBNTAC2 */ init_ubntac2_dissector(ndpi_struct, &a, detection_bitmask); + /* COAP */ + init_coap_dissector(ndpi_struct, &a, detection_bitmask); + + /* MQTT */ + init_mqtt_dissector(ndpi_struct, &a, detection_bitmask); + /* Put false-positive sensitive protocols at the end */ /* SKYPE */ |