Add S7Comm learning period configuration

Author: cardigliano

include/Prefs.h

@@ -67,7 +67,8 @@ class Prefs {
     tls_quic_hostnaming;
   u_int32_t behaviour_analysis_learning_period;
   u_int32_t iec60870_learning_period, modbus_learning_period,
-    devices_learning_period, mac_address_cache_duration;
+    s7comm_learning_period, devices_learning_period,
+    mac_address_cache_duration;
   u_int32_t host_port_learning_period;
   bool enable_flow_swap_heuristic;
   bool skip_dpi_for_collected_flows;
@@ -732,6 +733,7 @@ class Prefs {
   inline u_int64_t* getIEC104AllowedTypeIDs() { return (iec104_allowed_typeids);   };
   inline u_int32_t getIEC60870LearingPeriod() { return (iec60870_learning_period); };
   inline u_int32_t getModbusLearningPeriod()   { return (modbus_learning_period); };
+  inline u_int32_t getS7CommLearningPeriod()   { return (s7comm_learning_period); };
 #ifdef NTOPNG_PRO
   inline bool isAssetInventoryEnabled() { return(asset_inventory_enabled && !isASNModeEnabled()); };
   inline bool isSNMPTrapEnabled() { return snmp_trap_enabled; };

include/ntop_defines.h

@@ -644,7 +644,8 @@
 #define CONST_DEVICES_LEARNING_TIME 7200 /* 2 hours */
 #define CONST_HOST_PORT_LEARNING_TIME 7200 /* 2 hours */
 #define CONST_IEC104_LEARNING_TIME 21600 /* 6 hours */
-#define CONST_MODBUS_LEARNING_TIME 3600  /* 1 hour */
+#define CONST_MODBUS_LEARNING_TIME 21600 /* 6 hours */
+#define CONST_S7COMM_LEARNING_TIME 21600 /* 6 hours */
 #define CONST_INFLUXDB_KEY_EXPORTED_POINTS \
   "ntopng.cache.influxdb.num_exported_points"
 #define CONST_INFLUXDB_FLUSH_TIME 10         /* sec */
@@ -806,6 +807,8 @@
   NTOPNG_PREFS_PREFIX ".iec60870_learning_period"
 #define CONST_PREFS_MODBUS_ANALYSIS_LEARNING_PERIOD \
   NTOPNG_PREFS_PREFIX ".modbus_learning_period"
+#define CONST_PREFS_S7COMM_ANALYSIS_LEARNING_PERIOD \
+  NTOPNG_PREFS_PREFIX ".s7comm_learning_period"
 #define CONST_PREFS_HOST_PORT_LEARNING_PERIOD \
   NTOPNG_PREFS_PREFIX ".host_port_learning_period"
 #define CONST_PREFS_DEVICES_ANALYSIS_LEARNING_PERIOD \

scripts/locales/en.lua

@@ -7628,6 +7628,8 @@ local lang = {
     ["modbus_learning_period_description"] = "Configure the learning period for ModbusTCP traffic analysis. Default: 6 hours.",
     ["modbus_learning_period_title"] = "ModbusTCP Learning Period",
     ["mqtt"] = "MQTT",
+    ["s7comm_learning_period_description"] = "Configure the learning period for S7Comm traffic analysis. Default: 6 hours.",
+    ["s7comm_learning_period_title"] = "S7Comm Learning Period",
     ["multiple_ldap_account_type_description"] = "Choose the account type",
     ["multiple_ldap_account_type_title"] = "LDAP Accounts Type",
     ["multiple_timeseries_database_description"] = "The driver used for storing and retrieving timeseries data.<br><b>Note:</b> It's possible to use InfluxDB v.2 with a compatible v.1 bucket, however the Retention and the Buckets have to be managed by the InfluxDB GUI.<br>Minimum InfluxDB version supported: <b>1.5.1</b>",

scripts/lua/admin/prefs.lua

@@ -1261,11 +1261,11 @@ if auth.has_capability(auth.capabilities.preferences) then
 
         print('<thead class="table-primary"><tr><th colspan=2 class="info">' .. i18n("prefs.ot_protocols") ..
             '</th></tr></thead>')
-        -- By default 1 hour of learning
+        -- By default 6 hours of learning
         prefsInputFieldPrefs(subpage_active.entries["iec60870_learning_period"].title,
             subpage_active.entries["iec60870_learning_period"].description, "ntopng.prefs.", "iec60870_learning_period",
-            prefs.iec60870_learning_period or 3600, "number", nil, nil, nil, {
-                min = 21600,
+            prefs.iec60870_learning_period or 21600, "number", nil, nil, nil, {
+                min = 3600,
                 tformat = "hd"
             })
 
@@ -1277,6 +1277,14 @@ if auth.has_capability(auth.capabilities.preferences) then
                 tformat = "hd"
             })
 
+        -- By default 6 hours of learning
+        prefsInputFieldPrefs(subpage_active.entries["s7comm_learning_period"].title,
+            subpage_active.entries["s7comm_learning_period"].description, "ntopng.prefs.", "s7comm_learning_period",
+            prefs.s7comm_learning_period or 21600, "number", is_behaviour_analysis_enabled, nil, nil, {
+                min = 3600,
+                tformat = "hd"
+            })
+
         print(
             '<tr><th colspan=2 style="text-align:right;"><button type="submit" class="btn btn-primary" style="width:115px" disabled="disabled">' ..
             i18n("save") .. '</button></th></tr>')

scripts/lua/modules/prefs_menu.lua

@@ -518,6 +518,10 @@ local menu_subpages = {{
         modbus_learning_period = {
             title = i18n("prefs.modbus_learning_period_title"),
             description = i18n("prefs.modbus_learning_period_description")
+        },
+        s7comm_learning_period = {
+            title = i18n("prefs.s7comm_learning_period_title"),
+            description = i18n("prefs.s7comm_learning_period_description")
         }
     }
 }, {

src/Prefs.cpp

@@ -106,6 +106,7 @@ Prefs::Prefs(Ntop *_ntop) {
   behaviour_analysis_learning_status_post_learning = service_allowed;
   iec60870_learning_period = CONST_IEC104_LEARNING_TIME;
   modbus_learning_period = CONST_MODBUS_LEARNING_TIME;
+  s7comm_learning_period = CONST_S7COMM_LEARNING_TIME;
   devices_learning_period = CONST_DEVICES_LEARNING_TIME;
   host_port_learning_period = CONST_HOST_PORT_LEARNING_TIME;
   auth_session_duration = HTTP_SESSION_DURATION;
@@ -1186,6 +1187,8 @@ void Prefs::refreshBehaviourAnalysis() {
 						  CONST_IEC104_LEARNING_TIME);
   modbus_learning_period = getDefaultPrefsValue(CONST_PREFS_MODBUS_ANALYSIS_LEARNING_PERIOD,
 						CONST_MODBUS_LEARNING_TIME);
+  s7comm_learning_period = getDefaultPrefsValue(CONST_PREFS_S7COMM_ANALYSIS_LEARNING_PERIOD,
+						CONST_S7COMM_LEARNING_TIME);
   devices_learning_period = getDefaultPrefsValue(CONST_PREFS_DEVICES_ANALYSIS_LEARNING_PERIOD,
 						 CONST_DEVICES_LEARNING_TIME);
   host_port_learning_period = getDefaultPrefsValue(CONST_PREFS_HOST_PORT_LEARNING_PERIOD,
@@ -2917,6 +2920,8 @@ void Prefs::lua(lua_State *vm) {
                               iec60870_learning_period);
   lua_push_uint64_table_entry(vm, "modbus_learning_period",
                               modbus_learning_period);
+  lua_push_uint64_table_entry(vm, "s7comm_learning_period",
+                              s7comm_learning_period);
   lua_push_uint64_table_entry(vm, "mac_address_cache_duration",
                               mac_address_cache_duration);
   lua_push_bool_table_entry(vm, "enable_flow_swap_heuristic",