aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/include/ndpi_protocol_ids.h2
-rw-r--r--src/include/ndpi_protocols.h3
-rw-r--r--src/include/ndpi_typedefs.h6
-rw-r--r--src/lib/ndpi_main.c14
-rw-r--r--src/lib/protocols/hep.c70
-rw-r--r--src/lib/protocols/imo.c80
-rw-r--r--src/lib/protocols/tls.c7
-rw-r--r--src/lib/protocols/ubntac2.c2
8 files changed, 97 insertions, 87 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index d988cd140..2ac2f11e5 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -250,7 +250,7 @@ typedef enum {
NDPI_PROTOCOL_STARCRAFT = 213, /* Matteo Bracci <matteobracci1@gmail.com> */
NDPI_PROTOCOL_TEREDO = 214,
NDPI_PROTOCOL_HOTSPOT_SHIELD = 215,
- NDPI_PROTOCOL_HEP = 216, /* sipcapture.org QXIP BV */
+ NDPI_PROTOCOL_IMO = 216,
NDPI_PROTOCOL_GOOGLE_DRIVE = 217,
NDPI_PROTOCOL_OCS = 218,
NDPI_PROTOCOL_OFFICE_365 = 219,
diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h
index cb96270f1..192c0c63f 100644
--- a/src/include/ndpi_protocols.h
+++ b/src/include/ndpi_protocols.h
@@ -69,7 +69,7 @@ void ndpi_search_oscar(struct ndpi_detection_module_struct *ndpi_struct, struct
void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
void ndpi_search_sip(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
-void ndpi_search_hep(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
+void ndpi_search_imo(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
void ndpi_search_direct_download_link_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
void ndpi_search_mail_pop_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
@@ -301,7 +301,6 @@ void init_rtsp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
void init_sflow_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_shoutcast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_sip_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
-void init_hep_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_skinny_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_skype_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_smb_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
index bc067cbc7..67b4bc035 100644
--- a/src/include/ndpi_typedefs.h
+++ b/src/include/ndpi_typedefs.h
@@ -1191,11 +1191,15 @@ struct ndpi_flow_struct {
} ssh;
struct {
+ u_int8_t last_one_byte_pkt, last_byte;
+ } imo;
+
+ struct {
char answer[96];
} mdns;
struct {
- char version[96];
+ char version[32];
} ubntac2;
struct {
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 7076fd1ac..4c286a754 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -817,11 +817,11 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
no_master, "IPP", NDPI_PROTOCOL_CATEGORY_SYSTEM_OS,
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_ACCEPTABLE, NDPI_PROTOCOL_HEP,
+ ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_IMO,
0 /* can_have_a_subprotocol */, no_master,
- no_master, "HEP", NDPI_PROTOCOL_CATEGORY_NETWORK,
- ndpi_build_default_ports(ports_a, 9064, 0, 0, 0, 0) /* TCP */,
- ndpi_build_default_ports(ports_b, 9063, 0, 0, 0, 0) /* UDP */);
+ no_master, "IMO", NDPI_PROTOCOL_CATEGORY_VOIP,
+ 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_ACCEPTABLE, NDPI_PROTOCOL_HTTP,
1 /* can_have_a_subprotocol */, no_master,
no_master, "HTTP", NDPI_PROTOCOL_CATEGORY_WEB,
@@ -1266,7 +1266,7 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_TLS,
1 /* can_have_a_subprotocol */, no_master,
custom_master, "TLS", NDPI_PROTOCOL_CATEGORY_WEB,
- ndpi_build_default_ports(ports_a, 443, 3001 /* ntop */, 0, 0, 0) /* TCP */,
+ ndpi_build_default_ports(ports_a, 443, 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_ACCEPTABLE, NDPI_PROTOCOL_SSH,
0 /* can_have_a_subprotocol */, no_master,
@@ -2858,8 +2858,8 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
/* SIP */
init_sip_dissector(ndpi_struct, &a, detection_bitmask);
- /* HEP */
- init_hep_dissector(ndpi_struct, &a, detection_bitmask);
+ /* IMO */
+ init_imo_dissector(ndpi_struct, &a, detection_bitmask);
/* Teredo */
init_teredo_dissector(ndpi_struct, &a, detection_bitmask);
diff --git a/src/lib/protocols/hep.c b/src/lib/protocols/hep.c
deleted file mode 100644
index 02a559af8..000000000
--- a/src/lib/protocols/hep.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * hep.c
- *
- * Copyright (C) 2009-2011 by ipoque GmbH
- * Copyright (C) 2011-18 - ntop.org
- * Copyright (C) 2011-15 - QXIP BV
- *
- * This file is part of nDPI, an open source deep packet inspection
- * library based on the OpenDPI and PACE technology by ipoque GmbH
- *
- * nDPI is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * nDPI is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with nDPI. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-#include "ndpi_protocol_ids.h"
-
-#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_HEP
-
-#include "ndpi_api.h"
-
-
-static void ndpi_int_hep_add_connection(struct ndpi_detection_module_struct
- *ndpi_struct, struct ndpi_flow_struct *flow)
-{
- ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_HEP, NDPI_PROTOCOL_UNKNOWN);
-}
-
-void ndpi_search_hep(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
-{
- struct ndpi_packet_struct *packet = &flow->packet;
- const u_int8_t *packet_payload = packet->payload;
- u_int32_t payload_len = packet->payload_packet_len;
-
- NDPI_LOG_DBG(ndpi_struct, "searching HEP\n");
-
- if(payload_len > 10) {
- if(memcmp(packet_payload, "HEP3", 4) == 0) {
- NDPI_LOG_INFO(ndpi_struct, "found HEP3\n");
- ndpi_int_hep_add_connection(ndpi_struct, flow);
- return;
- }
- }
-
- NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
-}
-
-
-void init_hep_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
-{
- ndpi_set_bitmask_protocol_detection("HEP", ndpi_struct, detection_bitmask, *id,
- NDPI_PROTOCOL_HEP,
- ndpi_search_hep,
- NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
- SAVE_DETECTION_BITMASK_AS_UNKNOWN,
- ADD_TO_DETECTION_BITMASK);
-
- *id += 1;
-}
diff --git a/src/lib/protocols/imo.c b/src/lib/protocols/imo.c
new file mode 100644
index 000000000..dfc42a39b
--- /dev/null
+++ b/src/lib/protocols/imo.c
@@ -0,0 +1,80 @@
+/*
+ * imo.c
+ *
+ * Copyright (C) 2019 - ntop.org
+ *
+ * This file is part of nDPI, an open source deep packet inspection
+ * library based on the OpenDPI and PACE technology by ipoque GmbH
+ *
+ * nDPI is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * nDPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with nDPI. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ndpi_protocol_ids.h"
+
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_IMO
+
+#include "ndpi_api.h"
+
+static void ndpi_int_imo_add_connection(struct ndpi_detection_module_struct
+ *ndpi_struct, struct ndpi_flow_struct *flow) {
+ ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_IMO, NDPI_PROTOCOL_UNKNOWN);
+}
+
+void ndpi_search_imo(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
+ struct ndpi_packet_struct *packet = &flow->packet;
+
+ NDPI_LOG_DBG(ndpi_struct, "search IMO\n");
+
+ if(packet->payload_packet_len == 1) {
+ /* Two one byte consecutive packets with the same payload */
+ if((flow->protos.imo.last_one_byte_pkt == 1)
+ && (flow->protos.imo.last_byte == packet->payload[0]))
+ ndpi_int_imo_add_connection(ndpi_struct, flow);
+ else
+ flow->protos.imo.last_one_byte_pkt = 1, flow->protos.imo.last_byte = packet->payload[0];
+ } else if(((packet->payload_packet_len == 10)
+ && (packet->payload[0] == 0x09)
+ && (packet->payload[1] == 0x02))
+ || ((packet->payload_packet_len == 11)
+ && (packet->payload[0] == 0x00)
+ && (packet->payload[1] == 0x09)
+ && (packet->payload[2] == 0x03))
+ || ((packet->payload_packet_len == 1099)
+ && (packet->payload[0] == 0x88)
+ && (packet->payload[1] == 0x49)
+ && (packet->payload[2] == 0x1a)
+ && (packet->payload[3] == 0x00))) {
+ NDPI_LOG_INFO(ndpi_struct, "found IMO\n");
+ ndpi_int_imo_add_connection(ndpi_struct, flow);
+ } else {
+ if(flow->num_processed_pkts > 7)
+ NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
+ else
+ flow->protos.imo.last_one_byte_pkt = 0;
+ }
+}
+
+
+void init_imo_dissector(struct ndpi_detection_module_struct *ndpi_struct,
+ u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) {
+ ndpi_set_bitmask_protocol_detection("IMO", ndpi_struct, detection_bitmask, *id,
+ NDPI_PROTOCOL_IMO,
+ ndpi_search_imo,
+ NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
+ SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+ ADD_TO_DETECTION_BITMASK);
+ *id += 1;
+}
+
diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c
index 185706457..ce78d9322 100644
--- a/src/lib/protocols/tls.c
+++ b/src/lib/protocols/tls.c
@@ -1050,10 +1050,7 @@ void ndpi_search_tls_tcp_udp(struct ndpi_detection_module_struct *ndpi_struct,
if(packet->udp != NULL) {
/* DTLS dissector */
-#ifdef DEBUG_TLS
- int rc = /* sslTryAndRetrieveServerCertificate(...) */
-#endif
- sslTryAndRetrieveServerCertificate(ndpi_struct, flow);
+ int rc = sslTryAndRetrieveServerCertificate(ndpi_struct, flow);
#ifdef DEBUG_TLS
printf("==>> %u [rc: %u][len: %u][%s][version: %u]\n",
@@ -1061,7 +1058,7 @@ void ndpi_search_tls_tcp_udp(struct ndpi_detection_module_struct *ndpi_struct,
flow->protos.stun_ssl.ssl.ssl_version);
#endif
- if(flow->protos.stun_ssl.ssl.ssl_version != 0) {
+ if((rc == 0) && (flow->protos.stun_ssl.ssl.ssl_version != 0)) {
flow->guessed_protocol_id = NDPI_PROTOCOL_TLS;
if(flow->protos.stun_ssl.stun.num_udp_pkts > 0) {
diff --git a/src/lib/protocols/ubntac2.c b/src/lib/protocols/ubntac2.c
index cb6a02b6b..6fc004228 100644
--- a/src/lib/protocols/ubntac2.c
+++ b/src/lib/protocols/ubntac2.c
@@ -51,7 +51,7 @@ void ndpi_search_ubntac2(struct ndpi_detection_module_struct *ndpi_struct, struc
if(found) {
found += packet->payload[found+1] + 4; /* Skip model name */
- found++; /* Skip len*/
+ found++; /* Skip len */
if(found < packet->payload_packet_len) {
char version[256];
Powered by cgit, Themed by Ted Yin.