Add s7comm prefs

Author: cardigliano

include/Prefs.h

@@ -75,6 +75,8 @@ class Prefs {
 #ifdef NTOPNG_PRO
   ndpi_bitmap* modbus_allowed_function_codes;
   u_int modbus_too_many_exceptions;
+  ndpi_bitmap* s7comm_allowed_function_codes;
+  u_int s7comm_too_many_errors;
   bool data_archive_before_ttl_delete, asset_inventory_enabled, snmp_trap_enabled;
 #endif
   ServiceAcceptance behaviour_analysis_learning_status_during_learning,
@@ -740,6 +742,9 @@ class Prefs {
   inline ndpi_bitmap* getModbusAllowedFunctionCodes() { return (modbus_allowed_function_codes);  };
   inline void         setModbusTooManyExceptionsThreshold(u_int v) { modbus_too_many_exceptions = v;     }
   inline u_int        getModbusTooManyExceptionsThreshold()        { return(modbus_too_many_exceptions); }
+  inline ndpi_bitmap* getS7CommAllowedFunctionCodes() { return (s7comm_allowed_function_codes);  };
+  inline void         setS7CommTooManyErrorsThreshold(u_int v) { s7comm_too_many_errors = v;     }
+  inline u_int        getS7CommTooManyErrorsThreshold()        { return(s7comm_too_many_errors); }
 #endif
   inline u_int32_t devicesLearingPeriod() { return (devices_learning_period); };
   inline u_int32_t macAddressCacheDuration() { return (mac_address_cache_duration); };
@@ -763,6 +768,7 @@ class Prefs {
   };
 #ifdef NTOPNG_PRO
   void setModbusAllowedFunctionCodes(const char *function_codes);
+  void setS7CommAllowedFunctionCodes(const char *function_codes);
 #endif
   void setIEC104AllowedTypeIDs(const char* type_ids);
   void validate();

scripts/lua/modules/http_lint.lua

@@ -2384,6 +2384,7 @@ local known_parameters = {
     ["behaviour_analysis_learning_status_post_learning"] = validateNumber,
     ["iec60870_learning_period"] = validateNumber,
     ["modbus_learning_period"] = validateNumber,
+    ["s7comm_learning_period"] = validateNumber,
     ["devices_learning_period"] = validateNumber,
     ["host_port_learning_period"] = validateNumber,
     ["toggle_src_and_dst_using_ports"] = validateBool,

src/Prefs.cpp

@@ -262,6 +262,8 @@ Prefs::Prefs(Ntop *_ntop) {
 #ifdef NTOPNG_PRO
   modbus_allowed_function_codes = NULL; /* All allowed */
   modbus_too_many_exceptions = 5;
+  s7comm_allowed_function_codes = NULL; /* All allowed */
+  s7comm_too_many_errors = 5;
 #endif
 }
 
@@ -345,6 +347,8 @@ Prefs::~Prefs() {
 #ifdef NTOPNG_PRO
   if(modbus_allowed_function_codes)
     ndpi_bitmap_free(modbus_allowed_function_codes);
+  if(s7comm_allowed_function_codes)
+    ndpi_bitmap_free(s7comm_allowed_function_codes);
 #endif
 
   if(gateway)  delete gateway;
@@ -3318,6 +3322,43 @@ void Prefs::setModbusAllowedFunctionCodes(const char *function_codes) {
   }
 }
 
+/* *************************************** */
+
+void Prefs::setS7CommAllowedFunctionCodes(const char *function_codes) {
+  char *p, *buf, *tmp;
+
+  if(!function_codes) return;
+
+  if((strcmp(function_codes, "-1") == 0)) {
+    if(s7comm_allowed_function_codes != NULL) {
+      ndpi_bitmap_free(s7comm_allowed_function_codes);
+      s7comm_allowed_function_codes = NULL;
+    }
+  } else if((buf = strdup(function_codes))) {
+    if(s7comm_allowed_function_codes == NULL) {
+      if((s7comm_allowed_function_codes = ndpi_bitmap_alloc()) == NULL)
+	ntop->getTrace()->traceEvent(TRACE_WARNING, "Unable to allocate bitmap memory");
+    }
+
+    if(s7comm_allowed_function_codes) {
+      ndpi_bitmap_free(s7comm_allowed_function_codes);
+
+      if((s7comm_allowed_function_codes = ndpi_bitmap_alloc()) != NULL) {
+	p = strtok_r(buf, ",", &tmp);
+	while(p != NULL) {
+	  int f_code = atoi(p);
+
+	  ndpi_bitmap_set(s7comm_allowed_function_codes, f_code);
+
+	  p = strtok_r(NULL, ",", &tmp);
+	}
+      }
+    }
+
+    free(buf);
+  }
+}
+
 #endif
 
 /* *************************************** */