Merge pull request #610 from eglooca/pr-nest-log-sink

New dissector: Nest Log Sink

6 files changed, 91 insertions, 4 deletions

diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index 607e8deef..0d2712d20 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -77,8 +77,8 @@ typedef enum {
   NDPI_PROTOCOL_MEMCACHED             = 40, /* Memcached - Darryl Sokoloski <darryl@egloo.ca> */
   NDPI_PROTOCOL_SMBV23                = 41, /* SMB version 2/3 */  
   NDPI_PROTOCOL_MINING                = 42, /* Bitcoin, Ethereum, ZCash, Monero */
+  NDPI_PROTOCOL_NEST_LOG_SINK         = 43, /* Nest Log Sink (Nest Protect) - Darryl Sokoloski <darryl@egloo.ca> */
   
-  NDPI_PROTOCOL_FREE_43               = 43, /* Free */
   NDPI_PROTOCOL_FREE_44               = 44, /* Free */
   NDPI_PROTOCOL_FREE_45               = 45, /* Free */
   NDPI_PROTOCOL_FREE_46               = 46, /* Free */
diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h
index e1f3af4fb..48e005ce1 100644
--- a/src/include/ndpi_protocols.h
+++ b/src/include/ndpi_protocols.h
@@ -204,6 +204,7 @@ void ndpi_search_fix(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 void ndpi_search_csgo(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
 void ndpi_search_ajp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
 void ndpi_search_memcached(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
+void ndpi_search_nest_log_sink(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
 /* --- INIT FUNCTIONS --- */
 void init_diameter_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_afp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
@@ -359,4 +360,5 @@ void init_whatsapp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u
 void init_ajp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_fbzero_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_memcached_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
+void init_nest_log_sink_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 #endif /* __NDPI_PROTOCOLS_H__ */
diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
index 52da6195d..f0b47b358 100644
--- a/src/include/ndpi_typedefs.h
+++ b/src/include/ndpi_typedefs.h
@@ -596,6 +596,9 @@ struct ndpi_flow_tcp_struct {
 
 /* NDPI_PROTOCOL_MEMCACHED */
   u_int8_t memcached_matches;
+
+/* NDPI_PROTOCOL_NEST_LOG_SINK */
+  u_int8_t nest_log_sink_matches;
 }
 #ifndef WIN32
   __attribute__ ((__packed__))
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 3f5db625d..760d29a26 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -1225,10 +1225,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
 			    no_master, "Mining", CUSTOM_CATEGORY_MINING,
 			    ndpi_build_default_ports(ports_a, 8333, 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_FUN, NDPI_PROTOCOL_FREE_43,
+    ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_NEST_LOG_SINK,
 			    no_master,
-			    no_master, "Free", NDPI_PROTOCOL_CATEGORY_CUSTOM_1 /* dummy */,
-			    ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
+			    no_master, "NestLogSink", NDPI_PROTOCOL_CATEGORY_CLOUD,
+			    ndpi_build_default_ports(ports_a, 11095, 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_FUN, NDPI_PROTOCOL_FREE_44,
 			    no_master,
@@ -3226,6 +3226,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
   /* Memcached */
   init_memcached_dissector(ndpi_struct, &a, detection_bitmask);
 
+  /* Nest Log Sink */
+  init_nest_log_sink_dissector(ndpi_struct, &a, detection_bitmask);
+
   /* ----------------------------------------------------------------- */
 
   ndpi_struct->callback_buffer_size = a;
diff --git a/src/lib/protocols/nest_log_sink.c b/src/lib/protocols/nest_log_sink.c
new file mode 100644
index 000000000..62e8fa75f
--- /dev/null
+++ b/src/lib/protocols/nest_log_sink.c
@@ -0,0 +1,79 @@
+/*
+ * nest_log_sink.c
+ *
+ * Copyright (C) 2009-2011 by ipoque GmbH
+ * Copyright (C) 2011-18 - ntop.org
+ * Copyright (C) 2018 - eGloo Incorporated
+ *
+ * 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_NEST_LOG_SINK
+
+#include "ndpi_api.h"
+
+#define NEST_LOG_SINK_PORT          11095
+#define NEST_LOG_SINK_MIN_LEN       8
+#define NEST_LOG_SINK_MIN_MATCH     3
+
+void ndpi_search_nest_log_sink(
+        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 nest_log_sink\n");
+
+    if (packet->payload_packet_len < NEST_LOG_SINK_MIN_LEN) {
+        NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
+        return;
+    }
+
+    if (ntohs(packet->tcp->source) != NEST_LOG_SINK_PORT &&
+            ntohs(packet->tcp->dest) != NEST_LOG_SINK_PORT) {
+        NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
+        return;
+    }
+
+    if (packet->payload[1] <= 0x02 &&
+            (packet->payload[2] == 0x00 || packet->payload[2] == 0x10) &&
+            packet->payload[3] == 0x13)
+        flow->l4.tcp.nest_log_sink_matches++;
+
+    if (flow->l4.tcp.nest_log_sink_matches == NEST_LOG_SINK_MIN_MATCH) {
+        NDPI_LOG_INFO(ndpi_struct, "found nest_log_sink\n");
+        ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NEST_LOG_SINK, NDPI_PROTOCOL_UNKNOWN);
+    }
+}
+
+void init_nest_log_sink_dissector(
+        struct ndpi_detection_module_struct *ndpi_struct,
+        u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
+{
+    ndpi_set_bitmask_protocol_detection("NEST_LOG_SINK",
+            ndpi_struct, detection_bitmask, *id,
+            NDPI_PROTOCOL_NEST_LOG_SINK,
+            ndpi_search_nest_log_sink,
+            NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+            SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+            ADD_TO_DETECTION_BITMASK);
+
+    *id += 1;
+}
diff --git a/tests/pcap/nest_log_sink.pcap b/tests/pcap/nest_log_sink.pcap
new file mode 100644
index 000000000..2cf286d22
--- /dev/null
+++ b/tests/pcap/nest_log_sink.pcap