From 4d95dae2ae2beabbd9c4ceb86444a9643781ab8f Mon Sep 17 00:00:00 2001
From: havup <42641299+havup@users.noreply.github.com>
Date: Wed, 25 Mar 2020 19:05:49 +0800
Subject: Update ndpi_main.c

---
 src/lib/ndpi_main.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/lib/ndpi_main.c')

diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 21491c5e7..a9caf52ec 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -1782,6 +1782,12 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
 			    ndpi_build_default_ports(ports_a, 10050, 0, 0, 0, 0) /* TCP */,
 			    ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */
 			    );
+     ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_S7COMM,
+          1 /* no subprotocol */, no_master,
+          no_master, "s7comm", NDPI_PROTOCOL_CATEGORY_NETWORK,
+          ndpi_build_default_ports(ports_a, 102, 0, 0, 0, 0) /* TCP */,
+          ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */
+          );
 
 #ifdef CUSTOM_NDPI_PROTOCOLS
 #include "../../../nDPI-custom/custom_ndpi_main.c"
-- 
cgit v1.2.3


From ac17e0bea7a4629477ab32b6624daa9c6484b9b6 Mon Sep 17 00:00:00 2001
From: havup <42641299+havup@users.noreply.github.com>
Date: Wed, 25 Mar 2020 19:06:36 +0800
Subject: Update ndpi_main.c

---
 src/lib/ndpi_main.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/lib/ndpi_main.c')

diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index a9caf52ec..e6d7385e5 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -3531,6 +3531,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
 
   /* Targus Getdata */
   init_targus_getdata_dissector(ndpi_str, &a, detection_bitmask);
+  
+  /* S7 comm */
+  init_s7comm_dissector(ndpi_str, &a, detection_bitmask);
 
 #ifdef CUSTOM_NDPI_PROTOCOLS
 #include "../../../nDPI-custom/custom_ndpi_main_init.c"
-- 
cgit v1.2.3