diff --git a/include/flow_checks/UnexpectedServer.h b/include/flow_checks/UnexpectedServer.h
index e9ba50a54a4e..3bce3365a358 100644
--- a/include/flow_checks/UnexpectedServer.h
+++ b/include/flow_checks/UnexpectedServer.h
@@ -32,7 +32,7 @@ class UnexpectedServer : public FlowCheck {
   virtual FlowAlertType getAlertType() const = 0;
 
  protected:
-  bool isAllowedHost(Flow *f) { return (false); }
+  virtual bool isAllowedHost(Flow *f) { return (false); }
 
   virtual bool isAllowedProto(Flow *f) { return (false); }
   virtual const IpAddress *getServerIP(Flow *f) {
diff --git a/src/LuaEngineNtop.cpp b/src/LuaEngineNtop.cpp
index 8ca7470108c8..98b3a342c225 100644
--- a/src/LuaEngineNtop.cpp
+++ b/src/LuaEngineNtop.cpp
@@ -57,10 +57,10 @@ int ntop_lua_check(lua_State *vm, const char *func, int pos,
                                  "%s : expected %s[@pos %d], got %s", func,
                                  lua_typename(vm, expected_type), pos,
                                  lua_typename(vm, lua_type(vm, pos)));
-    return(CONST_LUA_PARAM_ERROR);
+    return (CONST_LUA_PARAM_ERROR);
   }
 
-  return(CONST_LUA_OK);
+  return (CONST_LUA_OK);
 }
 
 /* ****************************************** */
@@ -94,9 +94,9 @@ static int ntop_dump_file(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((fname = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if ((fd = fopen(fname, "r")) != NULL) {
     char tmp[1024];
@@ -116,10 +116,10 @@ static int ntop_dump_file(lua_State *vm) {
 
     fclose(fd);
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   } else {
     ntop->getTrace()->traceEvent(TRACE_INFO, "Unable to read file %s", fname);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
 }
 
@@ -135,9 +135,9 @@ static int ntop_dump_binary_file(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((fname = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   ntop->fixPath(fname);
   if ((fd = fopen(fname, "rb")) != NULL) {
@@ -150,10 +150,10 @@ static int ntop_dump_binary_file(lua_State *vm) {
 
     fclose(fd);
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   } else {
     ntop->getTrace()->traceEvent(TRACE_INFO, "Unable to read file %s", fname);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
 }
 
@@ -163,12 +163,12 @@ static int ntop_get_mac_manufacturer(lua_State *vm) {
   const char *mac = NULL;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   mac = (char *)lua_tostring(vm, 1);
 
   ntop->getMacManufacturer(mac, vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -182,7 +182,7 @@ static int ntop_get_host_information(lua_State *vm) {
   lua_push_str_table_entry(vm, "instance_name",
                            ntop->getPrefs()->get_instance_name());
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -194,10 +194,10 @@ static int ntop_set_bind_addr(lua_State *vm, bool http) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!ntop->isUserAdministrator(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   addr = (char *)lua_tostring(vm, 1);
 
   if (lua_type(vm, 2) == LUA_TSTRING) addr2 = (char *)lua_tostring(vm, 2);
@@ -208,7 +208,7 @@ static int ntop_set_bind_addr(lua_State *vm, bool http) {
     ntop->getPrefs()->bind_https_to_address(addr, addr2);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 static int ntop_set_http_bind_addr(lua_State *vm) {
@@ -230,7 +230,7 @@ static int ntop_shutdown(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!ntop->isUserAdministrator(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (lua_type(vm, 1) == LUA_TSTRING) {
     action = (char *)lua_tostring(vm, 1);
@@ -246,7 +246,7 @@ static int ntop_shutdown(lua_State *vm) {
   ntop->getGlobals()->requestShutdown();
   lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -255,7 +255,7 @@ static int ntop_is_shuttingdown(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   lua_pushboolean(vm, ntop->getGlobals()->isShutdownRequested());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -264,7 +264,7 @@ static int ntop_list_interfaces(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
   lua_newtable(vm);
   Utils::listInterfaces(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -274,15 +274,15 @@ static int ntop_ip_cmp(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   a.set((char *)lua_tostring(vm, 1));
   b.set((char *)lua_tostring(vm, 2));
 
   lua_pushinteger(vm, a.compare(&b));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -294,13 +294,13 @@ static int ntop_setDomainMask(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   domain = lua_tostring(vm, 1);
 
   rc = ntop->nDPISetDomainMask(domain, 0 /* mask all */);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, rc));
+  return (ntop_lua_return_value(vm, __FUNCTION__, rc));
 }
 
 /* ****************************************** */
@@ -312,13 +312,13 @@ static int ntop_addTrustedIssuerDN(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   dn = lua_tostring(vm, 1);
 
   rc = ntop->getSystemInterface()->addTrustedIssuerDN(dn);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, rc));
+  return (ntop_lua_return_value(vm, __FUNCTION__, rc));
 }
 
 /* ****************************************** */
@@ -329,16 +329,16 @@ static int ntop_set_mac_device_type(lua_State *vm) {
   bool overwriteType;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   mac = (char *)lua_tostring(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   dtype = (DeviceType)lua_tonumber(vm, 2);
   if (dtype >= device_max_type) dtype = device_unknown;
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TBOOLEAN) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   overwriteType = (bool)lua_toboolean(vm, 3);
 
   for (int i = 0; i < ntop->get_num_interfaces(); i++) {
@@ -349,7 +349,7 @@ static int ntop_set_mac_device_type(lua_State *vm) {
   }
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -360,7 +360,7 @@ static int ntop_reload_host_pools(lua_State *vm) {
   ntop->reloadHostPools();
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -372,14 +372,14 @@ static int ntop_set_routing_mode(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TBOOLEAN) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   routing_enabled = lua_toboolean(vm, 1);
   ntop->getPrefs()->set_routing_mode(routing_enabled);
 
   lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 #endif
 
@@ -391,7 +391,7 @@ static int ntop_is_routing_mode(lua_State *vm) {
 
   lua_pushboolean(vm, ntop->getPrefs()->is_routing_mode());
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 #endif
 
@@ -403,12 +403,12 @@ static int ntop_is_dir(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   path = (char *)lua_tostring(vm, 1);
 
   lua_pushboolean(vm, Utils::dir_exists(path));
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -421,14 +421,14 @@ static int ntop_is_not_empty_file(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   path = (char *)lua_tostring(vm, 1);
 
   rc = (stat(path, &buf) != 0) ? 0 : 1;
   if (rc && (buf.st_size == 0)) rc = 0;
   lua_pushboolean(vm, rc);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -443,7 +443,7 @@ static int ntop_alert_store_query(lua_State *vm) {
   if (lua_type(vm, 1) != LUA_TSTRING ||
       !(query = (char *)lua_tostring(vm, 1))) {
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
 
   if (lua_type(vm, 2) == LUA_TSTRING) {
@@ -464,15 +464,15 @@ static int ntop_alert_store_query(lua_State *vm) {
 
   if (iface == NULL) {
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
 
   if (!iface->alert_store_query(vm, query, limit_rows)) {
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -485,27 +485,27 @@ int ntop_release_triggered_alert(lua_State *vm, OtherAlertableEntity *alertable,
   time_t when;
 
   if (!c->iface || !alertable)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, idx, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((key = (char *)lua_tostring(vm, idx++)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, idx, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((periodicity = (ScriptPeriodicity)lua_tointeger(vm, idx++)) >=
       MAX_NUM_PERIODIC_SCRIPTS)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, idx, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   when = (time_t)lua_tonumber(vm, idx++);
 
   /* The released alert will be pushed to LUA */
   alertable->releaseAlert(vm, std::string(key), periodicity, when);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -522,45 +522,46 @@ int ntop_store_triggered_alert(lua_State *vm, OtherAlertableEntity *alertable,
   /* bool triggered; */
 
   if (!alertable || !c->iface)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, idx, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((key = (char *)lua_tostring(vm, idx++)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, idx, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
-  if ((periodicity = (ScriptPeriodicity)lua_tointeger(vm, idx++)) >= MAX_NUM_PERIODIC_SCRIPTS)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  if ((periodicity = (ScriptPeriodicity)lua_tointeger(vm, idx++)) >=
+      MAX_NUM_PERIODIC_SCRIPTS)
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, idx, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   score = lua_tointeger(vm, idx++);
 
   if (ntop_lua_check(vm, __FUNCTION__, idx, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   alert_type = (AlertType)lua_tonumber(vm, idx++);
 
   if (ntop_lua_check(vm, __FUNCTION__, idx, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((alert_subtype = (char *)lua_tostring(vm, idx++)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, idx, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((alert_json = (char *)lua_tostring(vm, idx++)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
-  ip        = (char*)lua_tostring(vm, idx++);
-  name      = (char*)lua_tostring(vm, idx++);
-  port      = (u_int16_t)lua_tonumber(vm, idx++);
+  ip = (char *)lua_tostring(vm, idx++);
+  name = (char *)lua_tostring(vm, idx++);
+  port = (u_int16_t)lua_tonumber(vm, idx++);
 
-  /* triggered = */ alertable->triggerAlert(vm, std::string(key), periodicity,
-                                            time(NULL), score, alert_type,
-                                            alert_subtype, alert_json, ip, name, port);
+  /* triggered = */ alertable->triggerAlert(
+      vm, std::string(key), periodicity, time(NULL), score, alert_type,
+      alert_subtype, alert_json, ip, name, port);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -571,7 +572,7 @@ static int ntop_get_file_dir_exists(lua_State *vm) {
   int rc;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   path = (char *)lua_tostring(vm, 1);
 
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s(%s) called", __FUNCTION__,
@@ -580,7 +581,7 @@ static int ntop_get_file_dir_exists(lua_State *vm) {
   //   ntop->getTrace()->traceEvent(TRACE_ERROR, "%s: %d", path, rc);
   lua_pushboolean(vm, rc);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -592,7 +593,7 @@ static int ntop_get_file_last_change(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   path = (char *)lua_tostring(vm, 1);
 
   if (stat(path, &buf) == 0)
@@ -600,7 +601,7 @@ static int ntop_get_file_last_change(lua_State *vm) {
   else
     lua_pushinteger(vm, -1); /* not found */
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -611,7 +612,7 @@ static int ntop_has_geoip(lua_State *vm) {
   lua_pushboolean(
       vm,
       ntop->getGeolocation() && ntop->getGeolocation()->isAvailable() ? 1 : 0);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -629,7 +630,7 @@ static int ntop_elasticsearch_connection(lua_State *vm) {
   } else
     lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -639,7 +640,7 @@ static int ntop_get_instance_name(lua_State *vm) {
 
   lua_pushstring(vm, ntop->getPrefs()->get_instance_name());
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -655,7 +656,7 @@ static int ntop_is_windows(lua_State *vm) {
 #endif
   );
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -671,7 +672,7 @@ static int ntop_is_freebsd(lua_State *vm) {
 #endif
   );
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -687,7 +688,7 @@ static int ntop_is_linux(lua_State *vm) {
 #endif
   );
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -698,11 +699,11 @@ static int ntop_initnDPIReload(lua_State *vm) {
   if (ntop->isnDPIReloadInProgress() || (!ntop->initnDPIReload())) {
     /* initnDPIReload abort */
     lua_pushboolean(vm, false);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   }
 
   lua_pushboolean(vm, true /* can now start reloading */);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -716,26 +717,26 @@ static int ntop_loadCustomCategoryIp(lua_State *vm) {
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK) {
     lua_pushboolean(vm, false);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
   net = (char *)lua_tostring(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK) {
     lua_pushboolean(vm, false);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
   catid = (ndpi_protocol_category_t)lua_tointeger(vm, 2);
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK) {
     lua_pushboolean(vm, false);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
   listname = (char *)lua_tostring(vm, 3);
 
   success = ntop->nDPILoadIPCategory(net, catid, listname);
 
   lua_pushboolean(vm, success);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -749,74 +750,77 @@ static int ntop_loadCustomCategoryHost(lua_State *vm) {
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK) {
     lua_pushboolean(vm, false);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
   host = (char *)lua_tostring(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK) {
     lua_pushboolean(vm, false);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
   catid = (ndpi_protocol_category_t)lua_tointeger(vm, 2);
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK) {
     lua_pushboolean(vm, false);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
   listname = (char *)lua_tostring(vm, 3);
 
   success = ntop->nDPILoadHostnameCategory(host, catid, listname);
 
   lua_pushboolean(vm, success);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
 
-static bool is_valid_host(char *_host, enum list_file_type t, bool ignorePrivateIPs) {
+static bool is_valid_host(char *_host, enum list_file_type t,
+                          bool ignorePrivateIPs) {
   char host[256], *div, *slash;
   int cidr = 128;
-  
+
   snprintf(host, sizeof(host), "%s", _host);
 
-  if((div = strchr(host, '\t')) != NULL) div[0] = '\0';
-  if((div = strchr(host, ' '))  != NULL) div[0] = '\0';
-  if((slash = strchr(host, '/'))  != NULL) {
+  if ((div = strchr(host, '\t')) != NULL) div[0] = '\0';
+  if ((div = strchr(host, ' ')) != NULL) div[0] = '\0';
+  if ((slash = strchr(host, '/')) != NULL) {
     slash[0] = '\0';
     cidr = atoi(&slash[1]);
   }
-  
-  if(cidr < 12) {
-    /* ntop->getTrace()->traceEvent(TRACE_WARNING, "CIDR too small %s [%d]", host, t); */
-    return(false);
+
+  if (cidr < 12) {
+    /* ntop->getTrace()->traceEvent(TRACE_WARNING, "CIDR too small %s [%d]",
+     * host, t); */
+    return (false);
   }
-      
-  if(t == list_type_hosts) {
-    if(strcmp(host, "localhost"))
-      return(true);
+
+  if (t == list_type_hosts) {
+    if (strcmp(host, "localhost")) return (true);
   } else {
-    if(ignorePrivateIPs) {
+    if (ignorePrivateIPs) {
       IpAddress ip;
-      
-      if((strcmp(host, "127.0.0.1") == 0)
-	 || (strcmp(host, "255.255.255.255") == 0) 
-	 || (strncmp(host, "0.0.0.0", 7) == 0) 
-	 || (strchr(host, ':') != NULL) /* Ignore IPv6 */
-	 ) {
-	/* ntop->getTrace()->traceEvent(TRACE_WARNING, "Discarding IP address %s", host); */
-	return(false);
-      }    
-
-      ip.set((const char*)host);
-      
-      if(ip.isPrivateAddress()) {
-	/* ntop->getTrace()->traceEvent(TRACE_INFO, "WARNING: xsIgnoring private IP address %s", host); */
-	return(false);
+
+      if ((strcmp(host, "127.0.0.1") == 0) ||
+          (strcmp(host, "255.255.255.255") == 0) ||
+          (strncmp(host, "0.0.0.0", 7) == 0) ||
+          (strchr(host, ':') != NULL) /* Ignore IPv6 */
+      ) {
+        /* ntop->getTrace()->traceEvent(TRACE_WARNING, "Discarding IP address
+         * %s", host); */
+        return (false);
+      }
+
+      ip.set((const char *)host);
+
+      if (ip.isPrivateAddress()) {
+        /* ntop->getTrace()->traceEvent(TRACE_INFO, "WARNING: xsIgnoring private
+         * IP address %s", host); */
+        return (false);
       }
     }
   }
 
-  return(true);
+  return (true);
 }
 
 /* ****************************************** */
@@ -834,151 +838,145 @@ static int ntop_loadCustomCategoryFile(lua_State *vm) {
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK) {
     lua_pushinteger(vm, (int)num_lines_loaded);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
   path = (char *)lua_tostring(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK) {
     lua_pushinteger(vm, (int)num_lines_loaded);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
   list_type = (enum list_file_type)lua_tointeger(vm, 2);
 
-  if(list_type >= list_type_max) {
+  if (list_type >= list_type_max) {
     lua_pushinteger(vm, (int)num_lines_loaded);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TNUMBER) != CONST_LUA_OK) {
     lua_pushinteger(vm, (int)num_lines_loaded);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
   catid = (ndpi_protocol_category_t)lua_tointeger(vm, 3);
 
   if (ntop_lua_check(vm, __FUNCTION__, 4, LUA_TSTRING) != CONST_LUA_OK) {
     lua_pushinteger(vm, (int)num_lines_loaded);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
   listname = (char *)lua_tostring(vm, 4);
 
-  if(ntop_lua_check(vm, __FUNCTION__, 5, LUA_TBOOLEAN) == CONST_LUA_OK)
+  if (ntop_lua_check(vm, __FUNCTION__, 5, LUA_TBOOLEAN) == CONST_LUA_OK)
     ignorePrivateIPs = (bool)lua_toboolean(vm, 5);
 
-  if((fd = fopen(path, "r")) == NULL) {
-    ntop->getTrace()->traceEvent(TRACE_NORMAL, "Unable to open category list in %s",
-      path);
+  if ((fd = fopen(path, "r")) == NULL) {
+    ntop->getTrace()->traceEvent(TRACE_NORMAL,
+                                 "Unable to open category list in %s", path);
     lua_pushinteger(vm, (int)num_lines_loaded);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
 
-  switch(list_type) {
-  case list_type_hosts:
-    format = "%s\t%s";
-    break;
+  switch (list_type) {
+    case list_type_hosts:
+      format = "%s\t%s";
+      break;
 
-  case list_type_ip_csv:
-    format = "%[^,],%lf";
-    break;
+    case list_type_ip_csv:
+      format = "%[^,],%lf";
+      break;
 
-  case list_type_ip_occurrencies:
-    format = "%s\t%d";
-    break;
+    case list_type_ip_occurrencies:
+      format = "%s\t%d";
+      break;
 
-  case list_type_ip:
-    format = "%s";
-    break;
+    case list_type_ip:
+      format = "%s";
+      break;
 
-  default:
-    format = NULL;
-    break;
+    default:
+      format = NULL;
+      break;
   }
 
-  while(1) {
+  while (1) {
     char buffer[256];
     char *line = fgets(buffer, sizeof(buffer), fd);
     int len;
 
-    if(line == NULL || format == NULL)
-      break;
+    if (line == NULL || format == NULL) break;
 
     len = strlen(line);
 
-    if((len <= 1) || (line[0] == '#'))
-      continue;
+    if ((len <= 1) || (line[0] == '#')) continue;
 
-    if((line[len - 1] == '\n') || (line[len - 1] == '\r'))
+    if ((line[len - 1] == '\n') || (line[len - 1] == '\r'))
       line[len - 1] = '\0';
 
-    switch(list_type) {
-    case list_type_hosts:
-    case list_type_ip_csv:
-    case list_type_ip:
-      {
-	/*o
-	  Format
-	  127.0.0.1       domainname
-	  127.0.0.1,domainname
-	*/
-	char host[256], ignore[64];
-	bool loaded = false, success;
-	double f;
-
-	if(list_type == list_type_ip)
-	  success = (sscanf(line, format, host) == 1) ? true : false;
-	else if(list_type == list_type_hosts)
-	  success = (sscanf(line, format, ignore, host) == 2) ? true : false;
-	else
-	  success = (sscanf(line, format, host, &f) == 2) ? true : false;
-
-	if(success) {
-	  if(is_valid_host(host, list_type, ignorePrivateIPs)) {
-	    if(list_type == list_type_hosts)
-	      success = ntop->nDPILoadHostnameCategory(host, catid, listname);
-	    else
-	      success = ntop->nDPILoadIPCategory(host, catid, listname);
-
-	    if(success)
-	      num_lines_loaded++, loaded = true;
-	  }
-	}
+    switch (list_type) {
+      case list_type_hosts:
+      case list_type_ip_csv:
+      case list_type_ip: {
+        /*o
+          Format
+          127.0.0.1       domainname
+          127.0.0.1,domainname
+        */
+        char host[256], ignore[64];
+        bool loaded = false, success;
+        double f;
+
+        if (list_type == list_type_ip)
+          success = (sscanf(line, format, host) == 1) ? true : false;
+        else if (list_type == list_type_hosts)
+          success = (sscanf(line, format, ignore, host) == 2) ? true : false;
+        else
+          success = (sscanf(line, format, host, &f) == 2) ? true : false;
 
-	if(!loaded) {
-	  if(strcmp(line, "ip,score")) /* Silence Stratosphere Lab.txt */
-	    ntop->getTrace()->traceEvent(TRACE_NORMAL, "Invalid line format %s%s [%s]",
-					 ignorePrivateIPs ? "or private IP " : "",
-					 line, path);
-	}
-      }
-      break;
+        if (success) {
+          if (is_valid_host(host, list_type, ignorePrivateIPs)) {
+            if (list_type == list_type_hosts)
+              success = ntop->nDPILoadHostnameCategory(host, catid, listname);
+            else
+              success = ntop->nDPILoadIPCategory(host, catid, listname);
 
-    case list_type_ip_occurrencies:
-      {
-	/*
-	  Format
-	  127.0.0.1       occurrencies
-	*/
-	char host[64];
-	int occurrencies;
-	bool loaded = false;
-
-	if(sscanf(line, format, host, &occurrencies) == 2) {
-	  if(is_valid_host(host, list_type, ignorePrivateIPs)) {
-	    if(occurrencies >= 2) {
-	      if(ntop->nDPILoadIPCategory(host, catid, listname))
-		num_lines_loaded++, loaded = true;
-	    } else
-	      continue;
-	  }
-	}
+            if (success) num_lines_loaded++, loaded = true;
+          }
+        }
 
-	if(!loaded)
-	  ntop->getTrace()->traceEvent(TRACE_ERROR, "Invalid line format %s [%s]", line, path);
-      }
-      break;
+        if (!loaded) {
+          if (strcmp(line, "ip,score")) /* Silence Stratosphere Lab.txt */
+            ntop->getTrace()->traceEvent(
+                TRACE_NORMAL, "Invalid line format %s%s [%s]",
+                ignorePrivateIPs ? "or private IP " : "", line, path);
+        }
+      } break;
+
+      case list_type_ip_occurrencies: {
+        /*
+          Format
+          127.0.0.1       occurrencies
+        */
+        char host[64];
+        int occurrencies;
+        bool loaded = false;
+
+        if (sscanf(line, format, host, &occurrencies) == 2) {
+          if (is_valid_host(host, list_type, ignorePrivateIPs)) {
+            if (occurrencies >= 2) {
+              if (ntop->nDPILoadIPCategory(host, catid, listname))
+                num_lines_loaded++, loaded = true;
+            } else
+              continue;
+          }
+        }
 
-    default:
-      /* Not reached */
-      break;
+        if (!loaded)
+          ntop->getTrace()->traceEvent(
+              TRACE_ERROR, "Invalid line format %s [%s]", line, path);
+      } break;
+
+      default:
+        /* Not reached */
+        break;
     }
   } /* while */
 
@@ -986,7 +984,7 @@ static int ntop_loadCustomCategoryFile(lua_State *vm) {
 
   lua_pushinteger(vm, (int)num_lines_loaded);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1001,7 +999,7 @@ static int ntop_finalizenDPIReload(lua_State *vm) {
   ntop->setnDPICleanupNeeded(true);
 
   lua_pushboolean(vm, true /* reload performed */);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1015,7 +1013,7 @@ static int ntop_match_custom_category(lua_State *vm) {
   iface = ntop->getFirstInterface();
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   host_to_match = (char *)lua_tostring(vm, 1);
 
   if ((!iface) ||
@@ -1026,8 +1024,8 @@ static int ntop_match_custom_category(lua_State *vm) {
     /* Remember to unshift `match` (see Ntop::nDPILoadHostnameCategory) */
     lua_pushinteger(vm, ((int)match) & 0xFF);
   }
-  
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1040,13 +1038,13 @@ static int ntop_get_tls_version_name(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   tls_version = (u_int16_t)lua_tonumber(vm, 1);
 
   lua_pushstring(vm, ndpi_ssl_version2str(buf, sizeof(buf), tls_version,
                                           &unknown_version));
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1058,14 +1056,14 @@ static int ntop_get_mac_64(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   mac_str = (char *)lua_tostring(vm, 1);
 
   Utils::parseMac(mac, mac_str);
 
   lua_pushnumber(vm, Mac::to64(mac));
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1078,7 +1076,7 @@ static int ntop_is_ipv6(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   ip = (char *)lua_tostring(vm, 1);
 
   if (!ip || (inet_pton(AF_INET6, ip, &addr6) != 1))
@@ -1088,7 +1086,7 @@ static int ntop_is_ipv6(lua_State *vm) {
 
   lua_pushboolean(vm, rv);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1103,7 +1101,7 @@ static int ntop_get_flow_checks_stats(lua_State *vm) {
   else
     lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1114,7 +1112,7 @@ static int ntop_reload_flow_checks(lua_State *vm) {
   ntop->reloadFlowChecks();
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1125,7 +1123,7 @@ static int ntop_reload_host_checks(lua_State *vm) {
   ntop->reloadHostChecks();
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1134,11 +1132,11 @@ static int ntop_get_flow_alert_score(lua_State *vm) {
   FlowAlertTypeEnum alert_id;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   alert_id = (FlowAlertTypeEnum)lua_tonumber(vm, 1);
 
   lua_pushinteger(vm, ntop->getFlowAlertScore(alert_id));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1151,7 +1149,7 @@ static int ntop_get_risk_list(lua_State *vm) {
     lua_rawseti(vm, -2, i + 1);
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1160,11 +1158,11 @@ static int ntop_get_risk_str(lua_State *vm) {
   ndpi_risk_enum risk_id;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   risk_id = (ndpi_risk_enum)lua_tonumber(vm, 1);
 
   lua_pushstring(vm, ntop->getRiskStr(risk_id));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1173,18 +1171,18 @@ static int ntop_get_flow_alert_risk(lua_State *vm) {
   FlowAlertTypeEnum alert_id;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   alert_id = (FlowAlertTypeEnum)lua_tonumber(vm, 1);
 
   lua_pushinteger(vm, ntop->getFlowAlertRisk(alert_id));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
 
 static int ntop_get_flow_risk_alerts(lua_State *vm) {
   FlowRiskAlerts::lua(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1193,15 +1191,15 @@ static int ntop_get_flow_check_info(lua_State *vm) {
   const char *check_name;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   check_name = lua_tostring(vm, 1);
 
   if (!ntop->luaFlowCheckInfo(vm, check_name)) {
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1210,15 +1208,15 @@ static int ntop_get_host_check_info(lua_State *vm) {
   const char *check_name;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   check_name = lua_tostring(vm, 1);
 
   if (!ntop->luaHostCheckInfo(vm, check_name)) {
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1229,7 +1227,7 @@ static int ntop_reload_alert_exclusions(lua_State *vm) {
   ntop->reloadAlertExclusions();
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1239,12 +1237,12 @@ static int ntop_should_resolve_host(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((ip = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   lua_pushboolean(vm, Utils::shouldResolveHost(ip));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1254,13 +1252,13 @@ static int ntop_set_iec104_allowed_typeids(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((typeids = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   ntop->getPrefs()->setIEC104AllowedTypeIDs(typeids);
   lua_pushboolean(vm, true);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1271,13 +1269,13 @@ static int ntop_set_modbus_allowed_function_codes(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((function_codes = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   ntop->getPrefs()->setModbusAllowedFunctionCodes(function_codes);
   lua_pushboolean(vm, true);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 #endif
 
@@ -1286,7 +1284,7 @@ static int ntop_set_modbus_allowed_function_codes(lua_State *vm) {
 static int ntop_gainWriteCapabilities(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
   lua_pushboolean(vm, Utils::gainWriteCapabilities() == 0);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1294,7 +1292,7 @@ static int ntop_gainWriteCapabilities(lua_State *vm) {
 static int ntop_dropWriteCapabilities(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
   lua_pushboolean(vm, Utils::dropWriteCapabilities() == 0);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1307,11 +1305,11 @@ static int ntop_getservbyport(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   port = (int)lua_tonumber(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   proto = (char *)lua_tostring(vm, 2);
 
   if ((port > 0) && (proto != NULL)) s = getservbyport(htons(port), proto);
@@ -1325,7 +1323,7 @@ static int ntop_getservbyport(lua_State *vm) {
     lua_pushstring(vm, buf);
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1336,7 +1334,7 @@ static int ntop_msleep(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   ms_duration = (u_int)lua_tonumber(vm, 1);
 
   if (ms_duration > max_duration) ms_duration = max_duration;
@@ -1344,7 +1342,7 @@ static int ntop_msleep(lua_State *vm) {
   _usleep(ms_duration * 1000);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1440,18 +1438,18 @@ static int ntop_tcp_probe(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   server_ip = (char *)lua_tostring(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   server_port = (u_int)lua_tonumber(vm, 2);
 
   if (lua_type(vm, 3) == LUA_TNUMBER) timeout = (u_int16_t)lua_tonumber(vm, 3);
 
   if ((sockfd = Utils::openSocket(AF_INET, SOCK_STREAM, 0, "Lua TCP Probe")) <
       0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   memset(&serv_addr, '0', sizeof(serv_addr));
   serv_addr.sin_family = AF_INET;
@@ -1494,7 +1492,7 @@ static int ntop_tcp_probe(lua_State *vm) {
 
   Utils::closeSocket(sockfd);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1506,7 +1504,7 @@ static int ntop_list_dir_files(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   path = (char *)lua_tostring(vm, 1);
   ntop->fixPath(path);
 
@@ -1523,7 +1521,7 @@ static int ntop_list_dir_files(lua_State *vm) {
     (void)closedir(dirp);
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1541,7 +1539,7 @@ static int ntop_remove_dir_recursively(lua_State *vm) {
                           ? true /* OK */
                           : false /* Errors */);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1558,7 +1556,7 @@ static int ntop_unlink_file(lua_State *vm) {
   lua_pushboolean(
       vm, path && (unlink(path) == 0) ? true /* OK */ : false /* Errors */);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1576,7 +1574,7 @@ static int ntop_register_runtime_interface(lua_State *vm) {
   if (lua_type(vm, 2) == LUA_TSTRING) name = (char *)lua_tostring(vm, 2);
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TBOOLEAN) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   create_new_interface = (bool)lua_toboolean(vm, 3);
 
   if (lua_type(vm, 4) == LUA_TNUMBER) {
@@ -1597,8 +1595,7 @@ static int ntop_register_runtime_interface(lua_State *vm) {
   } else {
     /* Upload pcap on this interface */
 
-    if (if_id == -1)
-      if_id = iface->get_id();
+    if (if_id == -1) if_id = iface->get_id();
 
     bool rc = ntop->createRuntimeInterface(name, source, &if_id);
 
@@ -1606,7 +1603,7 @@ static int ntop_register_runtime_interface(lua_State *vm) {
   }
 
   lua_pushinteger(vm, new_if_id);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1619,18 +1616,18 @@ static int ntop_send_kafka_message(lua_State *vm) {
 
   /* <brokers>;<topic>;<options> */
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   kafka_broker_info = (char *)lua_tostring(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   message = (char *)lua_tostring(vm, 2);
 
   if (kafka_broker_info && message)
     lua_pushboolean(vm, ntop->sendKafkaMessage(kafka_broker_info, message,
                                                strlen(message)));
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 #endif
 
@@ -1647,21 +1644,21 @@ static int ntop_gettimemsec(lua_State *vm) {
   ret = (((double)tp.tv_usec) / (double)1000000) + tp.tv_sec;
 
   lua_pushnumber(vm, ret);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
 
 static int ntop_getticks(lua_State *vm) {
   lua_pushnumber(vm, Utils::getticks());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
 
 static int ntop_gettickspersec(lua_State *vm) {
   lua_pushnumber(vm, Utils::gettickspersec());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1678,7 +1675,7 @@ static int ntop_tzset(lua_State *vm) {
   tzset();
 #endif
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1691,19 +1688,19 @@ static int ntop_round_time(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   now = lua_tonumber(vm, 1);
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   rounder = lua_tonumber(vm, 2);
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TBOOLEAN) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   align_to_localtime = lua_toboolean(vm, 3);
 
   lua_pushinteger(
       vm, Utils::roundTime(now, rounder,
                            align_to_localtime ? ntop->get_time_offset() : 0));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1719,11 +1716,11 @@ static int ntop_inet_ntoa(lua_State *vm) {
   else if (lua_type(vm, 1) == LUA_TNUMBER)
     ip = (u_int32_t)lua_tonumber(vm, 1);
   else
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   in.s_addr = htonl(ip);
   lua_pushstring(vm, inet_ntoa(in));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1734,26 +1731,26 @@ static int ntop_brodcast_ips_message(lua_State *vm) {
   char *msg;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   msg = (char *)lua_tostring(vm, 1);
 
   ntop->broadcastIPSMessage(msg);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 static int ntop_time_to_refresh_ips_rules(lua_State *vm) {
   /* Read and reset the variable */
   lua_pushboolean(vm, ntop->timeToRefreshIPSRules());
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 static int ntop_ask_to_refresh_ips_rules(lua_State *vm) {
   ntop->askToRefreshIPSRules();
 
   lua_pushboolean(vm, true);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1764,24 +1761,23 @@ static int ntop_zmq_connect(lua_State *vm) {
 
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
-
 #ifdef HAVE_ZMQ
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((endpoint = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((topic = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   context = zmq_ctx_new(), subscriber = zmq_socket(context, ZMQ_SUB);
 
   if (zmq_connect(subscriber, endpoint) != 0) {
     zmq_close(subscriber);
     zmq_ctx_destroy(context);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   }
 
   if (zmq_setsockopt(subscriber, ZMQ_SUBSCRIBE, topic, strlen(topic)) != 0) {
@@ -1792,11 +1788,11 @@ static int ntop_zmq_connect(lua_State *vm) {
 
   getLuaVMUservalue(vm, zmq_context) = context;
   getLuaVMUservalue(vm, zmq_subscriber) = subscriber;
- #endif
+#endif
 
   lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 #endif
 
@@ -1806,7 +1802,7 @@ static int ntop_get_redis_stats(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   ntop->getRedis()->lua(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1817,12 +1813,12 @@ static int ntop_delete_redis_key(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   ntop->getRedis()->del(key);
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1831,10 +1827,10 @@ static int ntop_flush_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!ntop->isUserAdministrator(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_pushboolean(vm, (ntop->getRedis()->flushDb() == 0) ? true : false);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -1845,20 +1841,20 @@ static int ntop_add_set_member_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((value = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop->getRedis()->sadd(key, value) == 0) {
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   } else
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 }
 
 /* ****************************************** */
@@ -1869,20 +1865,20 @@ static int ntop_del_set_member_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((value = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop->getRedis()->srem(key, value) == 0) {
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   } else
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 }
 
 /* ****************************************** */
@@ -1893,16 +1889,15 @@ static int ntop_get_set_members_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   ntop->getRedis()->smembers(vm, key);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
 
-
 #ifdef HAVE_ZMQ
 #ifndef HAVE_NEDGE
 
@@ -1919,7 +1914,7 @@ static int ntop_zmq_disconnect(lua_State *vm) {
   zmq_ctx_destroy(context);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 #endif
@@ -1946,7 +1941,7 @@ static int ntop_zmq_receive(lua_State *vm) {
   do {
     rc = zmq_poll(&item, 1, 1000);
     if (rc < 0 || !curr_iface->isRunning()) /* CHECK */
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   } while (rc == 0);
 
   size = zmq_recv(subscriber, &h, sizeof(h), 0);
@@ -1988,13 +1983,13 @@ static int ntop_zmq_receive(lua_State *vm) {
       lua_pushfstring(vm, "%s", payload);
       ntop->getTrace()->traceEvent(TRACE_INFO, "[%u] %s", h.size, payload);
       free(payload);
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
     } else {
       free(payload);
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
     }
   } else
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 }
 #endif
 #endif
@@ -2012,7 +2007,7 @@ static int ntop_reload_preferences(lua_State *vm) {
   ntop->getPrefs()->reloadPrefsFromRedis();
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2023,17 +2018,17 @@ static int ntop_set_default_file_permissions(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   fpath = (char *)lua_tostring(vm, 1);
 
-  if (!fpath) return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  if (!fpath) return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
 #ifndef WIN32
   chmod(fpath, CONST_DEFAULT_FILE_MODE);
 #endif
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2044,7 +2039,7 @@ static int ntop_verbose_trace(lua_State *vm) {
   lua_pushboolean(vm, (ntop->getTrace()->get_trace_level() == MAX_TRACE_LEVEL)
                           ? true
                           : false);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2054,22 +2049,22 @@ static int ntop_send_udp_data(lua_State *vm) {
   char *host, *data;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   host = (char *)lua_tostring(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   port = (u_int16_t)lua_tonumber(vm, 2);
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   data = (char *)lua_tostring(vm, 3);
 
   if (Utils::sendUDPData(host, port, data)) {
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   } else {
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
 }
 
@@ -2082,18 +2077,18 @@ static int ntop_send_tcp_data(lua_State *vm) {
   int timeout = 0;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((host = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   port = (int32_t)lua_tonumber(vm, 2);
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((data = (char *)lua_tostring(vm, 3)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   /* Optional timeout */
   if (lua_type(vm, 4) == LUA_TNUMBER) timeout = lua_tonumber(vm, 4);
@@ -2101,7 +2096,7 @@ static int ntop_send_tcp_data(lua_State *vm) {
   rv = Utils::sendTCPData(host, port, data, timeout);
 
   lua_pushboolean(vm, rv);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2138,7 +2133,7 @@ static int ntop_has_speedtest_support(lua_State *vm) {
   lua_pushboolean(vm, false);
 #endif
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2146,7 +2141,7 @@ static int ntop_has_speedtest_support(lua_State *vm) {
 static int ntop_speedtest(lua_State *vm) {
   ntop->speedtest(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2154,7 +2149,7 @@ static int ntop_speedtest(lua_State *vm) {
 static int ntop_get_bl_stats(lua_State *vm) {
   ntop->getBlacklistStats()->lua(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2162,7 +2157,7 @@ static int ntop_get_bl_stats(lua_State *vm) {
 static int ntop_reset_bl_stats(lua_State *vm) {
   ntop->resetBlacklistStats();
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2173,12 +2168,11 @@ static int ntop_clickhouse_enabled(lua_State *vm) {
 
   /* Make sure database is enabled - e.g. not enabled on 'database'
    * runtime interfaces */
-  if (curr_iface->getDB() == NULL)
-    enabled = false;
+  if (curr_iface->getDB() == NULL) enabled = false;
 
   lua_pushboolean(vm, enabled);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2188,7 +2182,7 @@ static int ntop_clickhouse_import_dumps(lua_State *vm) {
   bool silence_warnings;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TBOOLEAN) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   else
     silence_warnings = (bool)lua_toboolean(vm, 1);
 
@@ -2197,7 +2191,7 @@ static int ntop_clickhouse_import_dumps(lua_State *vm) {
   lua_pushinteger(vm, 0);
 #endif
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2205,7 +2199,7 @@ static int ntop_clickhouse_import_dumps(lua_State *vm) {
 static int ntop_get_clickhouse_stats(lua_State *vm) {
   ntop->luaClickHouseStats(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2217,14 +2211,14 @@ static int ntop_http_redirect(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((url = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   build_redirect(url, NULL, str, sizeof(str));
   lua_pushstring(vm, str);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2241,10 +2235,10 @@ static int ntop_http_get(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if ((url = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 2) == LUA_TSTRING) {
     username = (char *)lua_tostring(vm, 2);
@@ -2283,7 +2277,7 @@ static int ntop_http_get(lua_State *vm) {
                      timeout, return_content, use_cookie_authentication, &stats,
                      NULL, NULL, follow_redirects, ip_version);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2300,14 +2294,14 @@ static int ntop_http_get_auth_token(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((url = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((auth_token = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 3) == LUA_TNUMBER) {
     timeout = lua_tointeger(vm, 3);
@@ -2335,7 +2329,7 @@ static int ntop_http_get_auth_token(lua_State *vm) {
                      timeout, return_content, use_cookie_authentication, &stats,
                      NULL, NULL, follow_redirects, ip_version);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2344,7 +2338,7 @@ static int ntop_http_get_prefix(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   lua_pushstring(vm, ntop->getPrefs()->get_http_prefix());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2353,7 +2347,7 @@ static int ntop_http_get_startup_epoch(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   lua_pushinteger(vm, ntop->getLastModifiedStaticFileEpoch());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2362,7 +2356,7 @@ static int ntop_http_get_static_file_epoch(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   lua_pushinteger(vm, ntop->getLastModifiedStaticFileEpoch());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2375,11 +2369,11 @@ static int ntop_http_purify_param(lua_State *vm) {
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK) {
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   }
 
   if ((str = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (lua_type(vm, 2) == LUA_TBOOLEAN)
     strict = lua_toboolean(vm, 2) ? true : false;
   if (lua_type(vm, 3) == LUA_TBOOLEAN)
@@ -2391,14 +2385,14 @@ static int ntop_http_purify_param(lua_State *vm) {
 
   if (buf == NULL) {
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   }
 
   Utils::purifyHTTPparam(buf, strict, allowURL, allowDots);
   lua_pushstring(vm, buf);
   free(buf);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2408,7 +2402,7 @@ static int ntop_get_prefs(lua_State *vm) {
 
   ntop->getPrefs()->lua(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2418,7 +2412,7 @@ static int ntop_is_ping_available(lua_State *vm) {
 
   lua_pushboolean(vm, ntop->canSendICMP());
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2428,7 +2422,7 @@ static int ntop_is_ping_iface_available(lua_State *vm) {
 
   lua_pushboolean(vm, ntop->canSelectNetworkIfaceICMP());
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2436,7 +2430,7 @@ static int ntop_is_ping_iface_available(lua_State *vm) {
 static int ntop_ping_host(lua_State *vm) {
 #ifdef WIN32
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 #else
   char *host, *ifname = NULL;
   bool is_v6;
@@ -2445,12 +2439,12 @@ static int ntop_ping_host(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((host = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TBOOLEAN) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   is_v6 = (bool)lua_toboolean(vm, 2);
 
   if (lua_type(vm, 3) == LUA_TBOOLEAN)
@@ -2464,7 +2458,7 @@ static int ntop_ping_host(lua_State *vm) {
 
     if (ping == NULL) {
       lua_pushnil(vm);
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
     } else
       ping->ping(host, is_v6);
   } else {
@@ -2476,11 +2470,11 @@ static int ntop_ping_host(lua_State *vm) {
       c->ping(host, is_v6, ifname);
     } else {
       lua_pushnil(vm);
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
     }
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 #endif
 }
 
@@ -2489,12 +2483,12 @@ static int ntop_ping_host(lua_State *vm) {
 static int ntop_collect_ping_results(lua_State *vm) {
 #ifdef WIN32
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 #else
   bool continuous = false;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TBOOLEAN) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   continuous = lua_toboolean(vm, 1) ? true : false;
 
@@ -2503,10 +2497,10 @@ static int ntop_collect_ping_results(lua_State *vm) {
   if (!continuous) {
     /* Ping one shot */
     ntop->collectResponses(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   } else {
     ntop->collectContinuousResponses(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   }
 
 #endif
@@ -2519,7 +2513,7 @@ static int ntop_get_nologin_username(lua_State *vm) {
 
   lua_pushstring(vm, NTOP_NOLOGIN_USER);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2528,7 +2522,7 @@ static int ntop_get_users(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   ntop->getUsers(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2537,7 +2531,7 @@ static int ntop_get_allowed_networks(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   ntop->getAllowedNetworks(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2547,9 +2541,8 @@ static int ntop_is_pcap_download_allowed(lua_State *vm) {
 
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
-  lua_pushboolean(vm,
-                  ntop->isPcapDownloadAllowed(vm, curr_iface->get_name()));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  lua_pushboolean(vm, ntop->isPcapDownloadAllowed(vm, curr_iface->get_name()));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2558,17 +2551,17 @@ static int ntop_is_administrator(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   lua_pushboolean(vm, ntop->isUserAdministrator(vm));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
 
 static bool allowLocalUserManagement(lua_State *vm) {
-  if (!ntop->isLocalUser(vm) && !ntop->isLocalAuthEnabled()) return(false);
+  if (!ntop->isLocalUser(vm) && !ntop->isLocalAuthEnabled()) return (false);
 
-  if (!ntop->isUserAdministrator(vm)) return(false);
+  if (!ntop->isUserAdministrator(vm)) return (false);
 
-  return(true);
+  return (true);
 }
 
 /* ****************************************** */
@@ -2581,36 +2574,36 @@ static int ntop_reset_user_password(lua_State *vm) {
 
   /* Username who requested the password change */
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((who = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((old_password = (char *)lua_tostring(vm, 3)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 4, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((new_password = (char *)lua_tostring(vm, 4)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   /* non-local users cannot change their local password */
   if ((strcmp(who, username) == 0) && !ntop->isLocalUser(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   /* only the administrator can change other users passwords */
   if ((strcmp(who, username) != 0) && !allowLocalUserManagement(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   /* only the administrator can use and empty old password */
   if ((old_password[0] == '\0') && !is_admin)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   ret = ntop->resetUserPassword(username, old_password, new_password);
 
@@ -2626,17 +2619,17 @@ static int ntop_change_user_role(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!allowLocalUserManagement(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((user_role = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   lua_pushboolean(vm, ntop->changeUserRole(username, user_role));
   return CONST_LUA_OK;
@@ -2650,17 +2643,17 @@ static int ntop_change_allowed_nets(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!allowLocalUserManagement(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((allowed_nets = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   lua_pushboolean(vm, ntop->changeAllowedNets(username, allowed_nets));
   return CONST_LUA_OK;
@@ -2674,17 +2667,17 @@ static int ntop_change_allowed_ifname(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!allowLocalUserManagement(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((allowed_ifname = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   lua_pushboolean(vm, ntop->changeAllowedIfname(username, allowed_ifname));
   return CONST_LUA_OK;
@@ -2698,17 +2691,17 @@ static int ntop_change_user_host_pool(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!allowLocalUserManagement(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((host_pool_id = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   lua_pushboolean(vm, ntop->changeUserHostPool(username, host_pool_id));
   return CONST_LUA_OK;
@@ -2722,17 +2715,17 @@ static int ntop_change_user_full_name(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!allowLocalUserManagement(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((full_name = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   lua_pushboolean(vm, ntop->changeUserFullName(username, full_name));
   return CONST_LUA_OK;
@@ -2746,17 +2739,17 @@ static int ntop_change_user_language(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!allowLocalUserManagement(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((language = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   lua_pushboolean(vm, ntop->changeUserLanguage(username, language));
   return CONST_LUA_OK;
@@ -2771,15 +2764,15 @@ static int ntop_change_user_historical_flow_permission(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!allowLocalUserManagement(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TBOOLEAN) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   allow_historical_flows = lua_toboolean(vm, 2) ? true : false;
 
   lua_pushboolean(vm, ntop->changeUserHistoricalFlowPermission(
@@ -2796,15 +2789,15 @@ static int ntop_change_user_alerts_permission(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!allowLocalUserManagement(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TBOOLEAN) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   allow_alerts = lua_toboolean(vm, 2) ? true : false;
 
   lua_pushboolean(vm, ntop->changeUserAlertsPermission(username, allow_alerts));
@@ -2820,15 +2813,15 @@ static int ntop_change_user_pcap_download_permission(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!allowLocalUserManagement(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TBOOLEAN) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   allow_pcap_download = lua_toboolean(vm, 2) ? true : false;
 
   lua_pushboolean(vm, ntop->changeUserPcapDownloadPermission(
@@ -2844,24 +2837,24 @@ static int ntop_post_http_json_data(lua_State *vm) {
   int timeout = 0;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((password = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((url = (char *)lua_tostring(vm, 3)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 4, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((json = (char *)lua_tostring(vm, 4)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   /* Optional timeout */
   if (lua_type(vm, 5) == LUA_TNUMBER) timeout = lua_tonumber(vm, 5);
@@ -2874,7 +2867,7 @@ static int ntop_post_http_json_data(lua_State *vm) {
                                     timeout, &stats);
 
   lua_pushboolean(vm, rv);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2887,22 +2880,22 @@ static int ntop_http_post(lua_State *vm) {
   HTTPTranferStats stats;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((url = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((form_data = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 3) == LUA_TSTRING) /* Optional */
     if ((username = (char *)lua_tostring(vm, 3)) == NULL)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 4) == LUA_TSTRING) /* Optional */
     if ((password = (char *)lua_tostring(vm, 4)) == NULL)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 5) == LUA_TNUMBER) /* Optional */
     timeout = lua_tonumber(vm, 5);
@@ -2917,7 +2910,7 @@ static int ntop_http_post(lua_State *vm) {
                      timeout, return_content, use_cookie_authentication, &stats,
                      form_data, NULL, true, 0);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2932,19 +2925,19 @@ static int ntop_http_post_auth_token(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((url = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((auth_token = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((form_data = (char *)lua_tostring(vm, 3)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 4) == LUA_TNUMBER) /* Optional */
     timeout = lua_tonumber(vm, 4);
@@ -2959,7 +2952,7 @@ static int ntop_http_post_auth_token(lua_State *vm) {
                      timeout, return_content, use_cookie_authentication, &stats,
                      form_data, NULL, true, 0);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -2974,19 +2967,19 @@ static int ntop_http_put_auth_token(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((url = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((auth_token = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((form_data = (char *)lua_tostring(vm, 3)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 4) == LUA_TNUMBER) /* Optional */
     timeout = lua_tonumber(vm, 4);
@@ -3001,7 +2994,7 @@ static int ntop_http_put_auth_token(lua_State *vm) {
                      timeout, return_content, use_cookie_authentication, &stats,
                      form_data, NULL, true, 0, true);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3012,14 +3005,14 @@ static int ntop_http_fetch(lua_State *vm) {
   int timeout = 30;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((url = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((f = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 3) == LUA_TNUMBER) /* Optional */
     timeout = lua_tonumber(vm, 3);
@@ -3030,7 +3023,7 @@ static int ntop_http_fetch(lua_State *vm) {
   Utils::httpGetPost(vm, url, NULL, NULL, NULL /* user_header_token */, timeout,
                      false, false, &stats, NULL, fname, true, 0);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3042,24 +3035,24 @@ static int ntop_post_http_text_file(lua_State *vm) {
   HTTPTranferStats stats;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((password = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((url = (char *)lua_tostring(vm, 3)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 4, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((path = (char *)lua_tostring(vm, 4)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 5) == LUA_TBOOLEAN) /* Optional */
     delete_file_after_post = lua_toboolean(vm, 5) ? true : false;
@@ -3080,7 +3073,7 @@ static int ntop_post_http_text_file(lua_State *vm) {
     }
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3091,29 +3084,29 @@ static int ntop_send_mail(lua_State *vm) {
   bool verbose = false, use_proxy = false;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((from = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((to = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((cc = (char *)lua_tostring(vm, 3)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 4, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((msg = (char *)lua_tostring(vm, 4)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 5, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((smtp_server = (char *)lua_tostring(vm, 5)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 6) == LUA_TSTRING) /* Optional */
     username = (char *)lua_tostring(vm, 6);
@@ -3128,9 +3121,9 @@ static int ntop_send_mail(lua_State *vm) {
     verbose = lua_toboolean(vm, 9);
 
   Utils::sendMail(vm, from, to, cc, msg, smtp_server, username, password,
-    use_proxy, verbose);
+                  use_proxy, verbose);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 #endif
 
@@ -3147,45 +3140,45 @@ static int ntop_add_user(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!allowLocalUserManagement(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((full_name = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((password = (char *)lua_tostring(vm, 3)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 4, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((host_role = (char *)lua_tostring(vm, 4)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 5, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((allowed_networks = (char *)lua_tostring(vm, 5)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 6, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((allowed_interface = (char *)lua_tostring(vm, 6)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 7) == LUA_TSTRING)
     if ((host_pool_id = (char *)lua_tostring(vm, 7)) == NULL)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 8) == LUA_TSTRING)
     if ((language = (char *)lua_tostring(vm, 8)) == NULL)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 9) == LUA_TBOOLEAN)
     allow_pcap_download = lua_toboolean(vm, 9);
@@ -3213,11 +3206,11 @@ static int ntop_create_user_session(lua_State *vm) {
   session_id[0] = '\0';
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (strlen(username) == 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 2) == LUA_TNUMBER) /* Optional */
     session_duration = lua_tonumber(vm, 2);
@@ -3227,11 +3220,11 @@ static int ntop_create_user_session(lua_State *vm) {
     char *curr_user = getLuaVMUserdata(vm, user);
 
     if (strcmp(curr_user, username) != 0)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
 
-  ntop->get_HTTPserver()->authorize_noconn(username, session_id,
-					   sizeof(session_id), session_duration);
+  ntop->get_HTTPserver()->authorize_noconn(
+      username, session_id, sizeof(session_id), session_duration);
 
   lua_pushstring(vm, session_id);
   return CONST_LUA_OK;
@@ -3245,9 +3238,9 @@ static int ntop_create_user_api_token(lua_State *vm) {
   api_token[0] = '\0';
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop->get_HTTPserver()->create_api_token(username, api_token,
                                                sizeof(api_token)))
@@ -3266,10 +3259,10 @@ static int ntop_get_user_api_token(lua_State *vm) {
   api_token[0] = '\0';
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   // get the username param from the Lua vm
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   char *curr_user = getLuaVMUserdata(vm, user);
   if (ntop->isUserAdministrator(vm) ||
@@ -3282,7 +3275,7 @@ static int ntop_get_user_api_token(lua_State *vm) {
 
     return CONST_LUA_OK;
   }
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 }
 
 /* ****************************************** */
@@ -3293,12 +3286,12 @@ static int ntop_delete_user(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!allowLocalUserManagement(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((username = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   lua_pushboolean(vm, ntop->deleteUser(username));
   return CONST_LUA_OK;
@@ -3314,13 +3307,13 @@ static int ntop_resolve_address(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((numIP = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   ntop->resolveHostName(numIP, symIP, sizeof(symIP));
   lua_pushstring(vm, symIP);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3337,18 +3330,18 @@ void lua_push_str_table_entry(lua_State *L, const char *key,
 /* ****************************************** */
 
 void lua_push_str_len_table_entry(lua_State *L, const char *key,
-				  const char *value,
-				  const unsigned int len) {
+                                  const char *value, const unsigned int len) {
   if (L) {
-    char *v = (char*)malloc(len+1);;
+    char *v = (char *)malloc(len + 1);
+    ;
 
-    if(v != NULL) {
+    if (v != NULL) {
       memcpy(v, value, len);
       v[len] = 0;
     }
 
     lua_pushstring(L, key);
-    if(v != NULL) {
+    if (v != NULL) {
       lua_pushstring(L, v);
       free(v);
     } else
@@ -3474,7 +3467,7 @@ static int ntop_is_package(lua_State *vm) {
 #endif
 
   lua_pushboolean(vm, is_package);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3486,7 +3479,7 @@ static int ntop_is_forced_community(lua_State *vm) {
   is_forced_community = ntop->getPro()->forced_community_edition();
 #endif
   lua_pushboolean(vm, is_forced_community);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3494,7 +3487,7 @@ static int ntop_is_forced_community(lua_State *vm) {
 static int ntop_is_pro(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
   lua_pushboolean(vm, ntop->getPrefs()->is_pro_edition());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3502,7 +3495,7 @@ static int ntop_is_pro(lua_State *vm) {
 static int ntop_is_enterprise_m(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
   lua_pushboolean(vm, ntop->getPrefs()->is_enterprise_m_edition());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3510,7 +3503,7 @@ static int ntop_is_enterprise_m(lua_State *vm) {
 static int ntop_is_enterprise_l(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
   lua_pushboolean(vm, ntop->getPrefs()->is_enterprise_l_edition());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3518,7 +3511,7 @@ static int ntop_is_enterprise_l(lua_State *vm) {
 static int ntop_is_enterprise_xl(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
   lua_pushboolean(vm, ntop->getPrefs()->is_enterprise_xl_edition());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3526,7 +3519,7 @@ static int ntop_is_enterprise_xl(lua_State *vm) {
 static int ntop_is_enterprise_xxl(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
   lua_pushboolean(vm, ntop->getPrefs()->is_enterprise_xxl_edition());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3534,7 +3527,7 @@ static int ntop_is_enterprise_xxl(lua_State *vm) {
 static int ntop_is_nedge(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
   lua_pushboolean(vm, ntop->getPrefs()->is_nedge_pro_edition());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3542,7 +3535,7 @@ static int ntop_is_nedge(lua_State *vm) {
 static int ntop_is_nedge_enterprise(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
   lua_pushboolean(vm, ntop->getPrefs()->is_nedge_enterprise_edition());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3554,7 +3547,7 @@ static int ntop_is_appliance(lua_State *vm) {
 #else
   lua_pushboolean(vm, false);
 #endif
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3570,7 +3563,7 @@ static int ntop_is_iot_bridge(lua_State *vm) {
 #else
   lua_pushboolean(vm, false);
 #endif
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3585,18 +3578,18 @@ static int ntop_run_extraction(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!ntop->isUserAdministrator(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 4, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 5, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (lua_type(vm, 6) == LUA_TNUMBER)
     max_bytes = lua_tonumber(vm, 6);
   else
@@ -3608,14 +3601,14 @@ static int ntop_run_extraction(lua_State *vm) {
   time_from = lua_tointeger(vm, 3);
   time_to = lua_tointeger(vm, 4);
   if ((filter = (char *)lua_tostring(vm, 5)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   max_bytes = lua_tonumber(vm, 6);
 
   ntop->getTimelineExtract()->runExtractionJob(id, ntop->getInterfaceById(ifid),
                                                time_from, time_to, filter,
                                                max_bytes, timeline_path);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3626,16 +3619,16 @@ static int ntop_stop_extraction(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!ntop->isUserAdministrator(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   id = lua_tointeger(vm, 1);
 
   ntop->getTimelineExtract()->stopExtractionJob(id);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3646,12 +3639,12 @@ static int ntop_is_extraction_running(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!ntop->isUserAdministrator(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   rv = ntop->getTimelineExtract()->isRunning();
 
   lua_pushboolean(vm, rv);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3660,11 +3653,11 @@ static int ntop_get_extraction_status(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!ntop->isUserAdministrator(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   ntop->getTimelineExtract()->getStatus(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3683,31 +3676,31 @@ static int ntop_run_live_extraction(lua_State *vm) {
 
   c = getLuaVMContext(vm);
 
-  if (!c) return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  if (!c) return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 4, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   ifid = lua_tointeger(vm, 1);
   time_from = lua_tointeger(vm, 2);
   time_to = lua_tointeger(vm, 3);
   if ((bpf = (char *)lua_tostring(vm, 4)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   /* Optional: by default use <id>/timeline as path */
   if (lua_tostring(vm, 5)) timeline_path = (char *)lua_tostring(vm, 5);
 
   iface = ntop->getInterfaceById(ifid);
-  if (!iface) return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  if (!iface) return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (!ntop->isPcapDownloadAllowed(vm, iface->get_name()))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   live_extraction_num_lock.lock(__FILE__, __LINE__);
   if (live_extraction_num < CONST_MAX_NUM_LIVE_EXTRACTIONS) {
@@ -3721,7 +3714,7 @@ static int ntop_run_live_extraction(lua_State *vm) {
 
     if (bpf) {
       success = timeline.extractLive(c->conn, iface, time_from, time_to, bpf,
-                                   timeline_path);
+                                     timeline_path);
 
       live_extraction_num_lock.lock(__FILE__, __LINE__);
       live_extraction_num--;
@@ -3732,7 +3725,7 @@ static int ntop_run_live_extraction(lua_State *vm) {
   }
 
   lua_pushboolean(vm, success);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3742,14 +3735,14 @@ static int ntop_bitmap_is_set(lua_State *vm) {
   u_int64_t val;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   bitmap = lua_tointeger(vm, 1);
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   val = lua_tointeger(vm, 2);
 
   lua_pushboolean(vm, Utils::bitmapIsSet(bitmap, val));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3759,14 +3752,14 @@ static int ntop_bitmap_set(lua_State *vm) {
   u_int64_t val;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   bitmap = lua_tointeger(vm, 1);
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   val = lua_tointeger(vm, 2);
 
   lua_pushinteger(vm, Utils::bitmapSet(bitmap, val));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3776,14 +3769,14 @@ static int ntop_bitmap_clear(lua_State *vm) {
   u_int64_t val;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   bitmap = lua_tointeger(vm, 1);
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   val = lua_tointeger(vm, 2);
 
   lua_pushinteger(vm, Utils::bitmapClear(bitmap, val));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3792,11 +3785,11 @@ static int ntop_map_score_to_severity(lua_State *vm) {
   u_int64_t score;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   score = lua_tointeger(vm, 1);
 
   lua_pushinteger(vm, (u_int32_t)Utils::mapScoreToSeverity(score));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3805,12 +3798,12 @@ static int ntop_map_severity_to_score(lua_State *vm) {
   AlertLevel alert_level;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   alert_level = (AlertLevel)lua_tointeger(vm, 1);
 
   lua_pushinteger(vm, Utils::mapSeverityToScore(alert_level));
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3821,7 +3814,7 @@ static int ntop_reset_stats(lua_State *vm) {
   ntop->resetStats();
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3831,7 +3824,7 @@ static int ntop_get_current_scripts_dir(lua_State *vm) {
 
   lua_pushstring(vm, ntop->get_scripts_dir());
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3852,7 +3845,7 @@ static int ntop_get_dirs(lua_State *vm) {
   lua_push_str_table_entry(vm, "etcdir", CONST_ETC_DIR);
   lua_push_str_table_entry(vm, "sharedir", CONST_SHARE_DIR);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3861,7 +3854,7 @@ static int ntop_get_uptime(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   lua_pushinteger(vm, ntop->getGlobals()->getUptime());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3903,7 +3896,7 @@ static int ntop_system_host_stat(lua_State *vm) {
   lua_insert(vm, -2);
   lua_settable(vm, -3);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3915,13 +3908,13 @@ static int ntop_get_system_alerts_stats(lua_State *vm) {
 
   iface = ntop->getSystemInterface();
 
-  if (!iface) return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  if (!iface) return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_newtable(vm);
 
   iface->luaNumEngagedAlerts(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3937,7 +3930,7 @@ static int ntop_refresh_cpu_load(lua_State *vm) {
   else
     lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3950,7 +3943,7 @@ static int ntop_check_license(lua_State *vm) {
 #endif
 
   lua_pushinteger(vm, 1);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -3992,7 +3985,7 @@ static int ntop_get_info(lua_State *vm) {
 #ifdef NTOPNG_PRO
       ntop->getPro()->is_oem() ? (char *)"" :
 #endif
-      (char *)"&copy; 1998-24 - ntop");
+                               (char *)"&copy; 1998-24 - ntop");
   lua_push_str_table_entry(vm, "authors", (char *)"The ntop team");
   lua_push_str_table_entry(vm, "license", (char *)"GNU GPLv3");
   lua_push_str_table_entry(vm, "platform", (char *)PACKAGE_MACHINE);
@@ -4016,11 +4009,10 @@ static int ntop_get_info(lua_State *vm) {
 #endif
   );
 
-  if(fd != NULL) {
+  if (fd != NULL) {
     char *rc = fgets(rsp, sizeof(rsp), fd);
 
-    if(rc != NULL)
-      lua_push_str_table_entry(vm, "hw_model", rsp);
+    if (rc != NULL) lua_push_str_table_entry(vm, "hw_model", rsp);
 
     fclose(fd);
   }
@@ -4096,8 +4088,9 @@ static int ntop_get_info(lua_State *vm) {
                              ntop->getPro()->get_encoded_license());
     lua_push_bool_table_entry(vm, "pro.has_valid_license",
                               ntop->getPro()->has_valid_license());
-    lua_push_str_table_entry(vm, "pro.license_type",
-			     ntop->getPro()->get_license_type(buf, sizeof(buf)));
+    lua_push_str_table_entry(
+        vm, "pro.license_type",
+        ntop->getPro()->get_license_type(buf, sizeof(buf)));
     lua_push_bool_table_entry(vm, "pro.forced_community",
                               ntop->getPro()->is_forced_community());
     lua_push_bool_table_entry(vm, "pro.out_of_maintenance",
@@ -4127,7 +4120,7 @@ static int ntop_get_info(lua_State *vm) {
   ntop->getPro()->lua(vm);
 #endif
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4139,13 +4132,13 @@ static int ntop_get_cookie_attributes(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!(conn = getLuaVMUserdata(vm, conn)))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (!(request_info = mg_get_request_info(conn)))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_pushstring(vm, (char *)get_secure_cookie_attributes(request_info));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4157,7 +4150,7 @@ static int ntop_is_allowed_interface(lua_State *vm) {
   char *allowed_ifname = getLuaVMUserdata(vm, allowed_ifname);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   id = lua_tointeger(vm, 1);
 
   if ((allowed_ifname == NULL) || (allowed_ifname[0] == '\0'))
@@ -4168,7 +4161,7 @@ static int ntop_is_allowed_interface(lua_State *vm) {
     rv = true;
 
   lua_pushboolean(vm, rv);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4180,7 +4173,7 @@ static int ntop_is_allowed_network(lua_State *vm) {
   AddressTree *allowed_nets = get_allowed_nets(vm);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   get_host_vlan_info((char *)lua_tostring(vm, 1), &host, &vlan_id, buf,
                      sizeof(buf));
 
@@ -4190,7 +4183,7 @@ static int ntop_is_allowed_network(lua_State *vm) {
     rv = true;
 
   lua_pushboolean(vm, rv);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4200,7 +4193,7 @@ static int ntop_is_local_interface_address(lua_State *vm) {
   IpAddress ipa;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   host = (char *)lua_tostring(vm, 1);
   ipa.set(host);
@@ -4208,7 +4201,7 @@ static int ntop_is_local_interface_address(lua_State *vm) {
   /* Check if this IP address is local to this machine */
   lua_pushboolean(vm, ipa.isLocalInterfaceAddress());
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4219,7 +4212,7 @@ static int ntop_is_local_address(lua_State *vm) {
   char shadow[64];
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   host = (char *)lua_tostring(vm, 1);
   snprintf(shadow, sizeof(shadow), "%s", host);
@@ -4258,7 +4251,7 @@ static int ntop_is_local_address(lua_State *vm) {
     lua_pushboolean(vm, ipa.isLocalHost());
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4269,7 +4262,7 @@ static int ntop_get_address_network(lua_State *vm) {
   int16_t local_network_id = -1;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   ip = (char *)lua_tostring(vm, 1);
 
@@ -4278,7 +4271,7 @@ static int ntop_get_address_network(lua_State *vm) {
 
   lua_pushinteger(vm, (u_int16_t)local_network_id);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4292,12 +4285,12 @@ static int ntop_get_resolved_address(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   get_host_vlan_info((char *)lua_tostring(vm, 1), &key, &vlan_id, buf,
                      sizeof(buf));
 
   if (key == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if ((redis->getAddress(key, rsp, sizeof(rsp), true) == 0) && (rsp[0] != '\0'))
     tmp = rsp;
@@ -4311,7 +4304,7 @@ static int ntop_get_resolved_address(lua_State *vm) {
 
   lua_pushfstring(vm, "%s", value);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4324,12 +4317,12 @@ static int ntop_resolve_host(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TBOOLEAN) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if ((host = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   ipv4 = lua_toboolean(vm, 2);
 
   if (ntop->resolveHost(host, buf, sizeof(buf), ipv4))
@@ -4337,7 +4330,7 @@ static int ntop_resolve_host(lua_State *vm) {
   else
     lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4351,7 +4344,7 @@ static int ntop_is_libsnmp_available(lua_State *vm) {
 #endif
   );
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4360,36 +4353,36 @@ static int ntop_snmp_max_num_engines(lua_State *vm) {
   u_int16_t num = 0;
 
 #ifdef NTOPNG_PRO
-  if(ntop->getPro()->has_valid_enterprise_xxl_license())
+  if (ntop->getPro()->has_valid_enterprise_xxl_license())
     num = NTOPNG_MAX_NUM_SNMP_DEVICES_ENT_XXL;
-  else if(ntop->getPro()->has_valid_enterprise_xl_license())
+  else if (ntop->getPro()->has_valid_enterprise_xl_license())
     num = NTOPNG_MAX_NUM_SNMP_DEVICES_ENT_XL;
-  else if(ntop->getPro()->has_valid_enterprise_l_license())
+  else if (ntop->getPro()->has_valid_enterprise_l_license())
     num = NTOPNG_MAX_NUM_SNMP_DEVICES_ENT_L;
-  else if(ntop->getPro()->has_valid_enterprise_m_license())
+  else if (ntop->getPro()->has_valid_enterprise_m_license())
     num = NTOPNG_MAX_NUM_SNMP_DEVICES_ENT_M;
 #endif
 #ifdef HAVE_NEDGE
-  if(ntop->getPro()->has_valid_nedge_enterprise_license())
+  if (ntop->getPro()->has_valid_nedge_enterprise_license())
     num = NTOPNG_MAX_NUM_SNMP_DEVICES_NEDGE;
 #endif
 
   lua_pushinteger(vm, num);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
 
 static int ntop_snmp_set_bulk_max_repetitions(lua_State *vm) {
   NtopngLuaContext *c = getLuaVMContext(vm);
-  
+
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   c->getbulkMaxNumRepetitions = (u_int8_t)lua_tointeger(vm, 1);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4397,32 +4390,32 @@ static int ntop_snmp_set_bulk_max_repetitions(lua_State *vm) {
 /* Synchronous calls */
 static int ntop_snmpget(lua_State *vm) {
   SNMP s;
-  
-  return(s.get(vm, false));
+
+  return (s.get(vm, false));
 }
 
 /* ****************************************** */
 
 static int ntop_snmpgetnext(lua_State *vm) {
   SNMP s;
-  
-  return(s.getnext(vm, false));
+
+  return (s.getnext(vm, false));
 }
 
 /* ****************************************** */
 
 static int ntop_snmpgetnextbulk(lua_State *vm) {
   SNMP s;
-  
-  return(s.getnextbulk(vm, false));
+
+  return (s.getnextbulk(vm, false));
 }
 
 /* ****************************************** */
 
 static int ntop_snmpset(lua_State *vm) {
   SNMP s;
-  
-  return(s.set(vm, false));
+
+  return (s.set(vm, false));
 }
 
 /* ****************************************** */
@@ -4443,12 +4436,12 @@ static int ntop_allocasnyncengine(lua_State *vm) {
   if (found_empty_slot) {
     if ((snmpAsyncEngine[slot_id] = new SNMP()) != NULL) {
       lua_pushinteger(vm, slot_id);
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
     }
   }
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4458,17 +4451,17 @@ static int ntop_freeasnyncengine(lua_State *vm) {
   u_int16_t slot_id;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   slot_id = (u_int16_t)lua_tonumber(vm, 1);
 
   if ((slot_id >= MAX_NUM_ASYNC_SNMP_ENGINES) ||
       (snmpAsyncEngine[slot_id] == NULL))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   delete snmpAsyncEngine[slot_id];
   snmpAsyncEngine[slot_id] = NULL;
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4478,15 +4471,15 @@ static int ntop_snmpgetasync(lua_State *vm) {
   u_int16_t slot_id;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   slot_id = (u_int16_t)lua_tonumber(vm, 1);
 
   if ((slot_id >= MAX_NUM_ASYNC_SNMP_ENGINES) ||
       (snmpAsyncEngine[slot_id] == NULL))
-    return(ntop_lua_return_value(vm, __FUNCTION__,
+    return (ntop_lua_return_value(vm, __FUNCTION__,
                                   CONST_LUA_ERROR)); /* Invalid slot selected */
 
-  return(snmpAsyncEngine[slot_id]->get(vm, true /* Skip first param */));
+  return (snmpAsyncEngine[slot_id]->get(vm, true /* Skip first param */));
 }
 
 /* ****************************************** */
@@ -4496,15 +4489,15 @@ static int ntop_snmpgetnextasync(lua_State *vm) {
   u_int16_t slot_id;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   slot_id = (u_int16_t)lua_tonumber(vm, 1);
 
   if ((slot_id >= MAX_NUM_ASYNC_SNMP_ENGINES) ||
       (snmpAsyncEngine[slot_id] == NULL))
-    return(ntop_lua_return_value(vm, __FUNCTION__,
+    return (ntop_lua_return_value(vm, __FUNCTION__,
                                   CONST_LUA_ERROR)); /* Invalid slot selected */
 
-  return(snmpAsyncEngine[slot_id]->getnext(vm, true /* Skip first param */));
+  return (snmpAsyncEngine[slot_id]->getnext(vm, true /* Skip first param */));
 }
 
 /* ****************************************** */
@@ -4514,15 +4507,16 @@ static int ntop_snmpgetnextbulkasync(lua_State *vm) {
   u_int16_t slot_id;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   slot_id = (u_int16_t)lua_tonumber(vm, 1);
 
   if ((slot_id >= MAX_NUM_ASYNC_SNMP_ENGINES) ||
       (snmpAsyncEngine[slot_id] == NULL))
-    return(ntop_lua_return_value(vm, __FUNCTION__,
+    return (ntop_lua_return_value(vm, __FUNCTION__,
                                   CONST_LUA_ERROR)); /* Invalid slot selected */
 
-  return(snmpAsyncEngine[slot_id]->getnextbulk(vm, true /* Skip first param */));
+  return (
+      snmpAsyncEngine[slot_id]->getnextbulk(vm, true /* Skip first param */));
 }
 
 /* ****************************************** */
@@ -4531,21 +4525,20 @@ static int ntop_snmpreadasyncrsp(lua_State *vm) {
   SNMP **snmpAsyncEngine = getLuaVMUserdata(vm, snmpAsyncEngine);
   u_int16_t slot_id;
   u_int timeout = 0; /* Don't wait */
-  
+
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   slot_id = (u_int16_t)lua_tonumber(vm, 1);
 
   if ((slot_id >= MAX_NUM_ASYNC_SNMP_ENGINES) ||
       (snmpAsyncEngine[slot_id] == NULL))
-    return(ntop_lua_return_value(vm, __FUNCTION__,
+    return (ntop_lua_return_value(vm, __FUNCTION__,
                                   CONST_LUA_ERROR)); /* Invalid slot selected */
 
-  if (lua_type(vm, 2) == LUA_TNUMBER)
-    timeout = (u_int8_t)lua_tonumber(vm, 2);
+  if (lua_type(vm, 2) == LUA_TNUMBER) timeout = (u_int8_t)lua_tonumber(vm, 2);
 
   snmpAsyncEngine[slot_id]->snmp_fetch_responses(vm, timeout);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4560,24 +4553,24 @@ static int ntop_snmpv3_batch_get(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!curr_iface)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 4, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 5, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 6, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 7, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 8, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   oid[0] = (char *)lua_tostring(vm, 8);
 
@@ -4587,7 +4580,7 @@ static int ntop_snmpv3_batch_get(lua_State *vm) {
     snmp = new SNMP();
 
     if (!snmp)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
     getLuaVMUservalue(vm, snmpBatch) = snmp;
   }
 
@@ -4603,9 +4596,9 @@ static int ntop_snmpv3_batch_get(lua_State *vm) {
       value_types, NULL, true /* batch */);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 #else
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 #endif
 }
 
@@ -4619,18 +4612,18 @@ static int ntop_snmp_batch_get(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!curr_iface)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
-  if (lua_type(vm, 4) != LUA_TNUMBER) return(ntop_snmpv3_batch_get(vm));
+  if (lua_type(vm, 4) != LUA_TNUMBER) return (ntop_snmpv3_batch_get(vm));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 4, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   oid[0] = (char *)lua_tostring(vm, 3);
 
@@ -4640,7 +4633,7 @@ static int ntop_snmp_batch_get(lua_State *vm) {
     snmp = new SNMP();
 
     if (!snmp)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
     getLuaVMUservalue(vm, snmpBatch) = snmp;
   }
 
@@ -4651,7 +4644,7 @@ static int ntop_snmp_batch_get(lua_State *vm) {
                                oid, true /* batch */);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4664,13 +4657,13 @@ static int ntop_snmp_read_responses(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if ((!curr_iface) || (!snmp))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   /* Optional timeout */
   if (lua_type(vm, 1) == LUA_TNUMBER) timeout = lua_tonumber(vm, 1);
 
   snmp->snmp_fetch_responses(vm, timeout);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4680,14 +4673,14 @@ static int ntop_snmp_toggle_trap_collection(lua_State *vm) {
   bool enable = false;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TBOOLEAN) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   enable = (bool)lua_toboolean(vm, 1);
 
   ntop->toggleSNMPTrapCollector(enable);
 #endif
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4700,7 +4693,7 @@ static int ntop_syslog(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   msg = (char *)lua_tostring(vm, 1);
   if (lua_type(vm, 2) == LUA_TNUMBER)
@@ -4709,7 +4702,7 @@ static int ntop_syslog(lua_State *vm) {
   syslog(syslog_severity, "%s", msg);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 #endif
 
@@ -4725,12 +4718,12 @@ static int ntop_syslog(lua_State *vm) {
 static int ntop_get_csrf_value(lua_State *vm) {
   const char *csrf = getLuaVMUservalue(vm, csrf);
 
-  if (!csrf) return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  if (!csrf) return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   lua_pushstring(vm, csrf);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4741,12 +4734,12 @@ static int ntop_md5(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   mg_md5(result, lua_tostring(vm, 1), NULL);
 
   lua_pushstring(vm, result);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4760,7 +4753,7 @@ static int ntop_has_radius_support(lua_State *vm) {
   lua_pushboolean(vm, false);
 #endif
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4774,7 +4767,7 @@ static int ntop_has_ldap_support(lua_State *vm) {
   lua_pushboolean(vm, false);
 #endif
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4800,7 +4793,7 @@ static int sqlite_callback(void *data, int argc, char **argv,
   lua_insert(s->vm, -2);
   lua_settable(s->vm, -3);
 
-  return(0);
+  return (0);
 }
 
 #endif
@@ -4827,26 +4820,26 @@ static int ntop_stats_insert_minute_sampling(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   ifid = lua_tointeger(vm, 1);
   if (ifid < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((sampling = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (!(iface = ntop->getInterfaceById(ifid)) ||
       !(sm = iface->getStatsManager()))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   time(&rawtime);
 
   if (sm->insertMinuteSampling(rawtime, sampling))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4871,27 +4864,27 @@ static int ntop_stats_insert_hour_sampling(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   ifid = lua_tointeger(vm, 1);
   if (ifid < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((sampling = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (!(iface = ntop->getInterfaceById(ifid)) ||
       !(sm = iface->getStatsManager()))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   time(&rawtime);
   rawtime -= (rawtime % 60);
 
   if (sm->insertHourSampling(rawtime, sampling))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4916,27 +4909,27 @@ static int ntop_stats_insert_day_sampling(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   ifid = lua_tointeger(vm, 1);
   if (ifid < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((sampling = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (!(iface = ntop->getInterfaceById(ifid)) ||
       !(sm = iface->getStatsManager()))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   time(&rawtime);
   rawtime -= (rawtime % 60);
 
   if (sm->insertDaySampling(rawtime, sampling))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -4961,24 +4954,24 @@ static int ntop_stats_get_minute_sampling(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   ifid = lua_tointeger(vm, 1);
   if (ifid < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   epoch = (time_t)lua_tointeger(vm, 2);
 
   if (!(iface = ntop->getInterfaceById(ifid)) ||
       !(sm = iface->getStatsManager()))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (sm->getMinuteSampling(epoch, &sampling))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_pushstring(vm, sampling.c_str());
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5002,28 +4995,28 @@ static int ntop_stats_delete_minute_older_than(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!ntop->isUserAdministrator(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   ifid = lua_tointeger(vm, 1);
   if (ifid < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   num_days = lua_tointeger(vm, 2);
   if (num_days < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (!(iface = ntop->getInterfaceById(ifid)) ||
       !(sm = iface->getStatsManager()))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (sm->deleteMinuteStatsOlderThan(num_days))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5047,28 +5040,28 @@ static int ntop_stats_delete_hour_older_than(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!ntop->isUserAdministrator(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   ifid = lua_tointeger(vm, 1);
   if (ifid < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   num_days = lua_tointeger(vm, 2);
   if (num_days < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (!(iface = ntop->getInterfaceById(ifid)) ||
       !(sm = iface->getStatsManager()))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (sm->deleteHourStatsOlderThan(num_days))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5092,28 +5085,28 @@ static int ntop_stats_delete_day_older_than(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!ntop->isUserAdministrator(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   ifid = lua_tointeger(vm, 1);
   if (ifid < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   num_days = lua_tointeger(vm, 2);
   if (num_days < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (!(iface = ntop->getInterfaceById(ifid)) ||
       !(sm = iface->getStatsManager()))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (sm->deleteDayStatsOlderThan(num_days))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5138,35 +5131,35 @@ static int ntop_stats_get_minute_samplings_interval(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   ifid = lua_tointeger(vm, 1);
   if (ifid < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   epoch_start = lua_tointeger(vm, 2);
   if (epoch_start < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   epoch_end = lua_tointeger(vm, 3);
   if (epoch_end < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (!(iface = ntop->getInterfaceById(ifid)) ||
       !(sm = iface->getStatsManager()))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (sm->retrieveMinuteStatsInterval(epoch_start, epoch_end, &retvals))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_newtable(vm);
 
   for (unsigned i = 0; i < retvals.rows.size(); i++)
     lua_push_str_table_entry(vm, retvals.rows[i].c_str(), (char *)"");
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5193,38 +5186,38 @@ static int ntop_stats_get_samplings_of_minutes_from_epoch(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   ifid = lua_tointeger(vm, 1);
   if (ifid < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   epoch_end = lua_tointeger(vm, 2);
   epoch_end -= (epoch_end % 60);
   if (epoch_end < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   num_minutes = lua_tointeger(vm, 3);
   if (num_minutes < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (!(iface = ntop->getInterfaceById(ifid)) ||
       !(sm = iface->getStatsManager()))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   epoch_start = epoch_end - (60 * num_minutes);
 
   if (sm->retrieveMinuteStatsInterval(epoch_start, epoch_end, &retvals))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_newtable(vm);
 
   for (unsigned i = 0; i < retvals.rows.size(); i++)
     lua_push_str_table_entry(vm, retvals.rows[i].c_str(), (char *)"");
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5251,38 +5244,38 @@ static int ntop_stats_get_samplings_of_hours_from_epoch(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   ifid = lua_tointeger(vm, 1);
   if (ifid < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   epoch_end = lua_tointeger(vm, 2);
   epoch_end -= (epoch_end % 60);
   if (epoch_end < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   num_hours = lua_tointeger(vm, 3);
   if (num_hours < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (!(iface = ntop->getInterfaceById(ifid)) ||
       !(sm = iface->getStatsManager()))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   epoch_start = epoch_end - (num_hours * 60 * 60);
 
   if (sm->retrieveHourStatsInterval(epoch_start, epoch_end, &retvals))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_newtable(vm);
 
   for (unsigned i = 0; i < retvals.rows.size(); i++)
     lua_push_str_table_entry(vm, retvals.rows[i].c_str(), (char *)"");
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5309,38 +5302,38 @@ static int ntop_stats_get_samplings_of_days_from_epoch(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   ifid = lua_tointeger(vm, 1);
   if (ifid < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   epoch_end = lua_tointeger(vm, 2);
   epoch_end -= (epoch_end % 60);
   if (epoch_end < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   num_days = lua_tointeger(vm, 3);
   if (num_days < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (!(iface = ntop->getInterfaceById(ifid)) ||
       !(sm = iface->getStatsManager()))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   epoch_start = epoch_end - (num_days * 24 * 60 * 60);
 
   if (sm->retrieveDayStatsInterval(epoch_start, epoch_end, &retvals))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_newtable(vm);
 
   for (unsigned i = 0; i < retvals.rows.size(); i++)
     lua_push_str_table_entry(vm, retvals.rows[i].c_str(), (char *)"");
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5370,12 +5363,12 @@ static int ntop_rrd_get_lastupdate(const char *filename, time_t *last_update,
       rrd_lastupdate_r(filename, last_update, ds_count, &ds_names, &last_ds);
 
   if (status != 0) {
-    return(-1);
+    return (-1);
   } else {
     for (i = 0; i < *ds_count; i++) free(last_ds[i]), free(ds_names[i]);
 
     free(last_ds), free(ds_names);
-    return(0);
+    return (0);
   }
 }
 
@@ -5438,21 +5431,21 @@ static int ntop_delete_old_rrd_files(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   strncpy(path, lua_tostring(vm, 1), sizeof(path) - 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((older_than_seconds = lua_tointeger(vm, 2)) < 0)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   ntop->fixPath(path);
 
   if (ntop_delete_old_rrd_files_recursive(path, now, older_than_seconds))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5464,13 +5457,13 @@ static int ntop_mkdir_tree(lua_State *vm) {
   lua_pushnil(vm);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((dir = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (dir[0] == '\0') {
     lua_pushboolean(vm, true);
-    return(ntop_lua_return_value(vm, __FUNCTION__,
+    return (ntop_lua_return_value(vm, __FUNCTION__,
                                   CONST_LUA_OK)); /* Nothing to do */
   }
 
@@ -5478,7 +5471,7 @@ static int ntop_mkdir_tree(lua_State *vm) {
                                dir);
 
   lua_pushboolean(vm, Utils::mkdir_tree(dir));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5509,7 +5502,7 @@ static int ntop_list_reports(lua_State *vm) {
     closedir(dir);
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5530,7 +5523,7 @@ static int ntop_info_redis(lua_State *vm) {
     free(rsp);
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5543,9 +5536,9 @@ static int ntop_get_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if ((rsp = (char *)malloc(rsp_len)) != NULL) {
     rsp[0] = '\0';
@@ -5574,7 +5567,7 @@ static int ntop_get_redis(lua_State *vm) {
   } else
     lua_pushfstring(vm, "");
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5588,9 +5581,9 @@ static int ntop_incr_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 2) == LUA_TNUMBER) amount = lua_tonumber(vm, 2);
 
@@ -5598,7 +5591,7 @@ static int ntop_incr_redis(lua_State *vm) {
 
   lua_pushinteger(vm, rsp);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5611,11 +5604,11 @@ static int ntop_get_hash_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((member = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   json_len = ntop->getRedis()->hstrlen(key, member);
   if (json_len == 0) {
@@ -5627,21 +5620,20 @@ static int ntop_get_hash_redis(lua_State *vm) {
       and not because it is an outdated value
     */
     lua_pushstring(vm, "");
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 #endif
   } else
     json_len += 8; /* Little overhead */
 
   if ((rsp = (char *)malloc(json_len)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
-  lua_pushfstring(vm, "%s",
-		  (redis->hashGet(key, member, rsp, json_len-1) == 0)
-		  ? rsp
-		  : (char *)"");
+  lua_pushfstring(
+      vm, "%s",
+      (redis->hashGet(key, member, rsp, json_len - 1) == 0) ? rsp : (char *)"");
   free(rsp);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5653,18 +5645,18 @@ static int ntop_set_hash_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((member = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((value = (char *)lua_tostring(vm, 3)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   redis->hashSet(key, member, value);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5695,18 +5687,18 @@ static int ntop_set_resolved_address(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((ip = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((name = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   redis->setResolvedAddress(ip, name);
 
   ntop_reset_host_name(vm, ip);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5717,18 +5709,18 @@ static int ntop_delete_hash_redis_key(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((member = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   ntop->getRedis()->hashDel(key, member);
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5741,9 +5733,9 @@ static int ntop_get_hash_keys_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   rc = redis->hashKeys(key, &vals);
 
@@ -5758,7 +5750,7 @@ static int ntop_get_hash_keys_redis(lua_State *vm) {
   } else
     lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5771,9 +5763,9 @@ static int ntop_get_hash_all_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   rc = redis->hashGetAll(key, &keys, &values);
 
@@ -5792,7 +5784,7 @@ static int ntop_get_hash_all_redis(lua_State *vm) {
   } else
     lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5805,9 +5797,9 @@ static int ntop_get_keys_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((pattern = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   rc = redis->keys(pattern, &keys);
 
@@ -5823,7 +5815,7 @@ static int ntop_get_keys_redis(lua_State *vm) {
 
   if (keys) free(keys);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5837,9 +5829,9 @@ static int ntop_lrange_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((l_name = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 2) == LUA_TNUMBER) {
     start_offset = lua_tointeger(vm, 2);
@@ -5863,7 +5855,7 @@ static int ntop_lrange_redis(lua_State *vm) {
 
   if (l_elements) free(l_elements);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5873,15 +5865,15 @@ static int ntop_llen_redis(lua_State *vm) {
   Redis *redis = ntop->getRedis();
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
-  if (!redis) return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  if (!redis) return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((l_name = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   lua_pushinteger(vm, redis->llen(l_name));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5890,7 +5882,7 @@ static int ntop_redis_has_dump(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   lua_pushboolean(vm, ntop->getRedis()->hasRedisDump());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5903,21 +5895,21 @@ static int ntop_redis_dump(lua_State *vm) {
 
   if (!redis->hasRedisDump()) {
     lua_pushnil(vm); /* This is old redis */
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   } else {
     if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
     if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
     dump = redis->dump(key);
 
     if (dump) {
       lua_pushfstring(vm, "%s", dump);
       free(dump);
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
     } else
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
 }
 
@@ -5931,20 +5923,20 @@ static int ntop_redis_restore(lua_State *vm) {
 
   if (!redis->hasRedisDump()) {
     lua_pushnil(vm); /* This is old redis */
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   } else {
     if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
     if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
     if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
     if ((dump = (char *)lua_tostring(vm, 2)) == NULL)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
     lua_pushboolean(vm, (redis->restore(key, dump) != 0));
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   }
 }
 
@@ -5958,27 +5950,27 @@ static int ntop_list_index_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((index_name = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   idx = lua_tointeger(vm, 2);
 
   if ((rsp = (char *)malloc(CONST_MAX_LEN_REDIS_VALUE)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (redis->lindex(index_name, idx, rsp, CONST_MAX_LEN_REDIS_VALUE) != 0) {
     free(rsp);
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   }
 
   lua_pushfstring(vm, "%s", rsp);
   free(rsp);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -5990,16 +5982,16 @@ static int ntop_lrpop_redis(lua_State *vm, bool lpop) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((list_name = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if ((lpop ? redis->lpop(list_name, msg, sizeof(msg))
             : redis->rpop(list_name, msg, sizeof(msg))) == 0) {
     lua_pushfstring(vm, "%s", msg);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   } else
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 }
 
 /* ****************************************** */
@@ -6024,14 +6016,14 @@ static int ntop_lrem_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if ((list_name = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((rem_value = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   ret = redis->lrem(list_name, rem_value);
 
@@ -6040,7 +6032,7 @@ static int ntop_lrem_redis(lua_State *vm) {
   else
     lua_pushboolean(vm, false);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6053,24 +6045,24 @@ static int ntop_ltrim_redis(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((list_name = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   start_idx = lua_tonumber(vm, 2);
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   end_idx = lua_tonumber(vm, 3);
 
   if (redis && redis->ltrim(list_name, start_idx, end_idx) == 0) {
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 }
 
 /* ****************************************** */
@@ -6082,14 +6074,14 @@ static int ntop_push_redis(lua_State *vm, bool use_lpush) {
   int rv;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((list_name = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((value = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   /* Optional trim list up to the specified number of elements */
   if (lua_type(vm, 3) == LUA_TNUMBER)
@@ -6102,9 +6094,9 @@ static int ntop_push_redis(lua_State *vm, bool use_lpush) {
 
   if (rv == 0) {
     lua_pushnil(vm);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   } else
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 }
 
 /* ****************************************** */
@@ -6128,17 +6120,17 @@ static int ntop_add_local_network(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!ntop->isUserAdministrator(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((local_network = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   ntop->addLocalNetworkList(local_network);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6152,7 +6144,7 @@ static int ntop_check_local_network_alias(lua_State *vm) {
     char *local_network;
 
     if ((local_network = (char *)lua_tostring(vm, 1)) == NULL)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
     network_id = ntop->getLocalNetworkId(local_network);
 
@@ -6163,11 +6155,11 @@ static int ntop_check_local_network_alias(lua_State *vm) {
   if (network_id != (u_int16_t)-1) {
     if (!ntop->getLocalNetworkAlias(vm, network_id)) {
       lua_pushnil(vm);
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
     }
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6179,15 +6171,15 @@ static int ntop_get_local_network_id(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((local_network = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   network_id = ntop->getLocalNetworkId(local_network);
 
   lua_pushinteger(vm, network_id);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6201,14 +6193,13 @@ static int ntop_check_sub_interface_syntax(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   filter = (char *)lua_tostring(vm, 1);
 
-  lua_pushboolean(vm, curr_iface
-                          ? curr_iface->checkSubInterfaceSyntax(filter)
-                          : false);
+  lua_pushboolean(
+      vm, curr_iface ? curr_iface->checkSubInterfaceSyntax(filter) : false);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 #endif
 #endif
@@ -6224,13 +6215,13 @@ static int ntop_check_filter_syntax(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   filter = (char *)lua_tostring(vm, 1);
 
-  lua_pushboolean(
-      vm, curr_iface ? curr_iface->checkFilterSyntax(filter) : false);
+  lua_pushboolean(vm,
+                  curr_iface ? curr_iface->checkFilterSyntax(filter) : false);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 #endif
 #endif
@@ -6248,7 +6239,7 @@ static int ntop_reload_traffic_profiles(lua_State *vm) {
     curr_iface->updateFlowProfiles(); /* Reload profiles in memory */
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 #endif
 #endif
@@ -6263,13 +6254,13 @@ static int _ntop_set_redis(bool do_setnx, lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((key = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 2) == LUA_TSTRING) {
     if ((value = (char *)lua_tostring(vm, 2)) == NULL)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   } else if (lua_type(vm, 2) == LUA_TNUMBER) {
     u_int v = (u_int)lua_tonumber(vm, 2);
     snprintf(buf, sizeof(buf), "%u", v);
@@ -6281,7 +6272,7 @@ static int _ntop_set_redis(bool do_setnx, lua_State *vm) {
     value = buf;
   } else {
     lua_pushboolean(vm, false);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   }
 
   /* Optional key expiration in SECONDS */
@@ -6295,21 +6286,21 @@ static int _ntop_set_redis(bool do_setnx, lua_State *vm) {
   else
     lua_pushboolean(vm, (redis->set(key, value, expire_secs) == 0));
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
 
 static int ntop_set_redis(lua_State *vm) {
-  return(_ntop_set_redis(false, vm));
+  return (_ntop_set_redis(false, vm));
 }
 static int ntop_setnx_redis(lua_State *vm) {
-  return(_ntop_set_redis(true, vm));
+  return (_ntop_set_redis(true, vm));
 }
 
 /* ****************************************** */
 
-static int ntop_set_preference(lua_State *vm) { return(ntop_set_redis(vm)); }
+static int ntop_set_preference(lua_State *vm) { return (ntop_set_redis(vm)); }
 
 /* ****************************************** */
 
@@ -6321,7 +6312,7 @@ static int ntop_is_login_disabled(lua_State *vm) {
 
   lua_pushboolean(vm, ret);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6331,10 +6322,10 @@ static int ntop_is_login_blacklisted(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if ((conn = getLuaVMUserdata(vm, conn)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_pushboolean(vm, ntop->isBlacklistedLogin(conn));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6344,7 +6335,7 @@ static int ntop_is_gui_access_restricted(lua_State *vm) {
 
   lua_pushboolean(vm, ntop->get_HTTPserver()->is_gui_access_restricted());
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6356,7 +6347,7 @@ static int ntop_service_restart(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_INFO, "%s() called", __FUNCTION__);
 
   if (!ntop->isUserAdministrator(vm))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (getppid() == 1 /* parent is systemd */) {
     /* See also ntop_shutdown (used by nEdge) */
@@ -6366,9 +6357,9 @@ static int ntop_service_restart(lua_State *vm) {
   }
 
   lua_pushboolean(vm, false);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 #else
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 #endif
 }
 
@@ -6406,7 +6397,7 @@ static int ntop_get_user_observation_point_id(lua_State *vm) {
     if (!rc) lua_pushinteger(vm, 0 /* No observation point */);
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6417,9 +6408,9 @@ static int ntop_set_logging_level(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_INFO, "%s() called", __FUNCTION__);
 
   if (ntop->getPrefs()->hasCmdlTraceLevel())
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lvlStr = (char *)lua_tostring(vm, 1);
 
@@ -6436,10 +6427,10 @@ static int ntop_set_logging_level(lua_State *vm) {
   else if (!strcmp(lvlStr, "error"))
     ntop->getTrace()->set_trace_level(TRACE_LEVEL_ERROR);
   else
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6452,27 +6443,27 @@ static int ntop_trace_event(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_INFO, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   level = lua_tointeger(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((fname = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   line = lua_tointeger(vm, 3);
 
   if (ntop_lua_check(vm, __FUNCTION__, 4, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   if ((msg = (char *)lua_tostring(vm, 4)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   ntop->getTrace()->traceEvent(level, fname, line, "%s", msg);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6486,17 +6477,17 @@ static int ntop_network_prefix(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((address = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   mask = (int)lua_tonumber(vm, 2);
 
   ip.set(address);
   lua_pushstring(vm, ip.print(buf, sizeof(buf), mask));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6535,7 +6526,7 @@ static const char **make_argv(lua_State *vm, int *argc_out, u_int offset,
   }
 
   *argc_out = argc;
-  return(argv);
+  return (argv);
 }
 
 /* ****************************************** */
@@ -6548,12 +6539,12 @@ static int ntop_rrd_create(lua_State *vm) {
   time_t start_time = time(NULL) - 86400 /* 1 day */;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((filename = (const char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   pdp_step = (unsigned long)lua_tonumber(vm, 2);
 
   if (lua_type(vm, 3) == LUA_TNUMBER) {
@@ -6589,7 +6580,7 @@ static int ntop_rrd_create(lua_State *vm) {
     chmod(filename, CONST_DEFAULT_FILE_MODE);
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6603,9 +6594,9 @@ static int ntop_rrd_update(lua_State *vm) {
   struct stat s;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((filename = (const char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (stat(filename, &s) != 0) {
     char error_buf[256];
@@ -6613,7 +6604,7 @@ static int ntop_rrd_update(lua_State *vm) {
     snprintf(error_buf, sizeof(error_buf), "File %s does not exist", filename);
     lua_pushstring(vm, error_buf);
 
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   }
 
   // Delete empty rrd files which cause an mmap error
@@ -6626,14 +6617,14 @@ static int ntop_rrd_update(lua_State *vm) {
 
     unlink(filename);
 
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   }
 
   if (lua_type(vm, 2) == LUA_TSTRING) {
     if ((when = (const char *)lua_tostring(vm, 2)) == NULL)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   } else if (lua_type(vm, 2) != LUA_TNIL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (lua_type(vm, 3) == LUA_TSTRING) v1 = (const char *)lua_tostring(vm, 3);
   if (lua_type(vm, 4) == LUA_TSTRING) v2 = (const char *)lua_tostring(vm, 4);
@@ -6678,10 +6669,10 @@ static int ntop_rrd_update(lua_State *vm) {
       lua_pushnil(vm);
 
     free(buf);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 }
 
 /* ****************************************** */
@@ -6692,18 +6683,18 @@ static int ntop_rrd_lastupdate(lua_State *vm) {
   unsigned long ds_count;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((filename = (const char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   reset_rrd_state();
 
   if (ntop_rrd_get_lastupdate(filename, &last_update, &ds_count) == -1) {
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   } else {
     lua_pushinteger(vm, last_update);
     lua_pushinteger(vm, ds_count);
-    return(2 /* 2 values returned */);
+    return (2 /* 2 values returned */);
   }
 }
 
@@ -6723,12 +6714,16 @@ static int ntop_rrd_tune(lua_State *vm) {
     ntop->getTrace()->traceEvent(TRACE_ERROR,
                                  "ntop_rrd_tune: invalid number of arguments");
     free(argv);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
   filename = argv[1];
 
   reset_rrd_state();
-  status = rrd_tune(argc, (std::conditional<std::is_same<decltype(rrd_tune), int(int, const char **)>::value, const char **, char **>::type)argv);
+  status = rrd_tune(
+      argc,
+      (std::conditional<
+          std::is_same<decltype(rrd_tune), int(int, const char **)>::value,
+          const char **, char **>::type)argv);
 
   if (status != 0) {
     char *err = rrd_get_error();
@@ -6746,7 +6741,7 @@ static int ntop_rrd_tune(lua_State *vm) {
 
   free(argv);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6780,14 +6775,14 @@ static int ntop_get_drop_pool_info(lua_State *vm) {
 
 static int ntop_is_forced_offline(lua_State *vm) {
   lua_pushboolean(vm, ntop->isForcedOffline());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
 
 static int ntop_is_offline(lua_State *vm) {
   lua_pushboolean(vm, ntop->isOffline());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6795,7 +6790,7 @@ static int ntop_is_offline(lua_State *vm) {
 static int ntop_set_offline(lua_State *vm) {
   ntop->toggleOffline(true);
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6808,9 +6803,9 @@ static int ntop_update_radius_login_info(lua_State *vm) {
 
   ntop->getTrace()->traceEvent(TRACE_INFO,
                                "Radius: updated radius login informations");
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 #else
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 #endif
 }
 
@@ -6819,21 +6814,21 @@ static int ntop_update_radius_login_info(lua_State *vm) {
 static int ntop_set_online(lua_State *vm) {
   ntop->toggleOffline(false);
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
 
 static int ntop_is_shutting_down(lua_State *vm) {
   lua_pushboolean(vm, ntop->getGlobals()->isShutdown());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
 
 static int ntop_limit_resources_usage(lua_State *vm) {
   lua_pushboolean(vm, ntop->getPrefs()->limitResourcesUsage());
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6845,43 +6840,43 @@ static int __ntop_rrd_args(lua_State *vm, char **filename, char **cf,
   rrd_time_value_t start_tv, end_tv;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((*filename = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((*cf = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if ((lua_type(vm, 3) == LUA_TNUMBER) && (lua_type(vm, 4) == LUA_TNUMBER))
     *start = (time_t)lua_tonumber(vm, 3), *end = (time_t)lua_tonumber(vm, 4);
   else {
     if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
     if ((start_s = (char *)lua_tostring(vm, 3)) == NULL)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
     if ((err = rrd_parsetime(start_s, &start_tv)) != NULL) {
       lua_pushstring(vm, err);
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
     }
 
     if (ntop_lua_check(vm, __FUNCTION__, 4, LUA_TSTRING) != CONST_LUA_OK)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
     if ((end_s = (char *)lua_tostring(vm, 4)) == NULL)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
     if ((err = rrd_parsetime(end_s, &end_tv)) != NULL) {
       lua_pushstring(vm, err);
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
     }
 
     if (rrd_proc_start_end(&start_tv, &end_tv, start, end) == -1)
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -6902,11 +6897,11 @@ static int __ntop_rrd_status(lua_State *vm, int status, char *filename,
       if (strstr(err, "fetching cdp from rra") != NULL)
         unlink(filename); /* 99,99999% this is a corrupted file */
 
-      return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+      return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
     }
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7012,7 +7007,7 @@ static int ntop_rrd_fetch(lua_State *vm) {
   lua_pushinteger(vm, (lua_Integer)end);
 
   /* number of return values: start, step, names, data, end */
-  return(5);
+  return (5);
 }
 
 /* ****************************************** */
@@ -7098,7 +7093,7 @@ static int ntop_rrd_fetch_columns(lua_State *vm) {
   rrd_freemem(data);
 
   /* number of return values */
-  return(6);
+  return (6);
 }
 
 /* ****************************************** */
@@ -7110,14 +7105,14 @@ static int ntop_network_name_by_id(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   id = (u_int32_t)lua_tonumber(vm, 1);
 
   name = ntop->getLocalNetworkName(id);
 
   lua_pushstring(vm, name ? name : "");
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7130,7 +7125,7 @@ static int ntop_network_id_by_name(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_INFO, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   name = (char *)lua_tostring(vm, 1);
 
   for (u_int16_t network_id = 0; network_id < num_local_networks;
@@ -7142,7 +7137,7 @@ static int ntop_network_id_by_name(lua_State *vm) {
   }
 
   lua_pushinteger(vm, found_id);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7158,7 +7153,7 @@ static int ntop_get_networks(lua_State *vm) {
     lua_push_uint64_table_entry(vm, ntop->getLocalNetworkName(network_id),
                                 network_id);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7175,7 +7170,7 @@ static int ntop_pop_internal_alerts(lua_State *vm) {
   } else
     lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7192,19 +7187,18 @@ static int ntop_recipient_enqueue(lua_State *vm) {
   AlertEntity alert_entity = alert_entity_other;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   recipient_id = lua_tointeger(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   alert = lua_tostring(vm, 2);
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   score = lua_tonumber(vm, 3);
 
-  if (lua_type(vm, 4) == LUA_TNUMBER)
-    alert_id = lua_tonumber(vm, 4);
+  if (lua_type(vm, 4) == LUA_TNUMBER) alert_id = lua_tonumber(vm, 4);
 
   if (lua_type(vm, 5) == LUA_TNUMBER)
     alert_entity = (AlertEntity)lua_tonumber(vm, 5);
@@ -7221,7 +7215,7 @@ static int ntop_recipient_enqueue(lua_State *vm) {
     notification->alert_id = alert_id;
     notification->alert_entity = alert_entity;
     notification->alert_category = alert_category;
-    //ntop->getTrace()->traceEvent(TRACE_NORMAL, "Enqueing alert: %s", alert);
+    // ntop->getTrace()->traceEvent(TRACE_NORMAL, "Enqueing alert: %s", alert);
     rv = ntop->recipient_enqueue(recipient_id, notification);
   }
 
@@ -7239,7 +7233,7 @@ static int ntop_recipient_enqueue(lua_State *vm) {
   }
 
   lua_pushboolean(vm, rv);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7249,7 +7243,7 @@ static int ntop_recipient_dequeue(lua_State *vm) {
   AlertFifoItem *notification;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   recipient_id = lua_tointeger(vm, 1);
 
   notification = ntop->recipient_dequeue(recipient_id);
@@ -7266,7 +7260,7 @@ static int ntop_recipient_dequeue(lua_State *vm) {
   } else
     lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7275,12 +7269,12 @@ static int ntop_recipient_stats(lua_State *vm) {
   u_int16_t recipient_id;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   recipient_id = lua_tointeger(vm, 1);
 
   ntop->recipient_stats(recipient_id, vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7289,12 +7283,12 @@ static int ntop_recipient_last_use(lua_State *vm) {
   u_int16_t recipient_id;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   recipient_id = lua_tointeger(vm, 1);
 
   lua_pushinteger(vm, ntop->recipient_last_use(recipient_id));
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7303,14 +7297,14 @@ static int ntop_recipient_delete(lua_State *vm) {
   u_int16_t recipient_id;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   recipient_id = lua_tointeger(vm, 1);
 
   ntop->recipient_delete(recipient_id);
 
   lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7318,68 +7312,68 @@ static int ntop_recipient_delete(lua_State *vm) {
 static int ntop_recipient_register(lua_State *vm) {
   u_int16_t recipient_id;
   AlertLevel minimum_severity = alert_level_none;
-  char *str_categories, *str_host_pools, *str_entities,
-    *str_flow_alert_types, *str_host_alert_types, *str_other_alert_types;
+  char *str_categories, *str_host_pools, *str_entities, *str_flow_alert_types,
+      *str_host_alert_types, *str_other_alert_types;
   bool match_alert_id = false, skip_alerts = false;
   Bitmap128 enabled_categories, enabled_host_pools, enabled_entities,
-    enabled_flow_alert_types, enabled_host_alert_types, enabled_other_alert_types;
+      enabled_flow_alert_types, enabled_host_alert_types,
+      enabled_other_alert_types;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   recipient_id = lua_tointeger(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   minimum_severity = (AlertLevel)lua_tointeger(vm, 2);
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((str_categories = (char *)lua_tostring(vm, 3)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   enabled_categories.setBits(str_categories);
 
   if (ntop_lua_check(vm, __FUNCTION__, 4, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((str_host_pools = (char *)lua_tostring(vm, 4)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   enabled_host_pools.setBits(str_host_pools);
 
   if (ntop_lua_check(vm, __FUNCTION__, 5, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((str_entities = (char *)lua_tostring(vm, 5)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   enabled_entities.setBits(str_entities);
 
   if ((lua_type(vm, 6) == LUA_TSTRING) &&
-    ((str_flow_alert_types = (char *)lua_tostring(vm, 6)) != NULL)) {
-      enabled_flow_alert_types.reset();
-      enabled_flow_alert_types.setBits(str_flow_alert_types);
-      match_alert_id = true; /* Match by ID (ignore severity, category, etc) */
+      ((str_flow_alert_types = (char *)lua_tostring(vm, 6)) != NULL)) {
+    enabled_flow_alert_types.reset();
+    enabled_flow_alert_types.setBits(str_flow_alert_types);
+    match_alert_id = true; /* Match by ID (ignore severity, category, etc) */
   }
 
   if ((lua_type(vm, 7) == LUA_TSTRING) &&
-    ((str_host_alert_types = (char *)lua_tostring(vm, 7)) != NULL)){
-      enabled_host_alert_types.reset();
-      enabled_host_alert_types.setBits(str_host_alert_types);
-      match_alert_id = true; /* Match by ID (ignore severity, category, etc) */
+      ((str_host_alert_types = (char *)lua_tostring(vm, 7)) != NULL)) {
+    enabled_host_alert_types.reset();
+    enabled_host_alert_types.setBits(str_host_alert_types);
+    match_alert_id = true; /* Match by ID (ignore severity, category, etc) */
   }
 
   if ((lua_type(vm, 8) == LUA_TSTRING) &&
-    ((str_other_alert_types = (char *)lua_tostring(vm, 8)) != NULL)){
-      enabled_other_alert_types.reset();
-      enabled_other_alert_types.setBits(str_other_alert_types);
-      match_alert_id = true; /* Match by ID (ignore severity, category, etc) */
+      ((str_other_alert_types = (char *)lua_tostring(vm, 8)) != NULL)) {
+    enabled_other_alert_types.reset();
+    enabled_other_alert_types.setBits(str_other_alert_types);
+    match_alert_id = true; /* Match by ID (ignore severity, category, etc) */
   }
 
-  if (lua_type(vm, 9) == LUA_TBOOLEAN)
-    skip_alerts = (bool)lua_toboolean(vm, 9);
+  if (lua_type(vm, 9) == LUA_TBOOLEAN) skip_alerts = (bool)lua_toboolean(vm, 9);
 
   /*
   char bitmap_buf[64];
-  ntop->getTrace()->traceEvent(TRACE_NORMAL, "Skip alerts: %s", skip_alerts ? "true" : "false");
-  ntop->getTrace()->traceEvent(TRACE_NORMAL, "Recipient ID = %u", recipient_id);
-  ntop->getTrace()->traceEvent(TRACE_NORMAL, "Categories bitmap: %s",
-  enabled_categories.toHexString(bitmap_buf, sizeof(bitmap_buf)));
+  ntop->getTrace()->traceEvent(TRACE_NORMAL, "Skip alerts: %s", skip_alerts ?
+  "true" : "false"); ntop->getTrace()->traceEvent(TRACE_NORMAL, "Recipient ID =
+  %u", recipient_id); ntop->getTrace()->traceEvent(TRACE_NORMAL, "Categories
+  bitmap: %s", enabled_categories.toHexString(bitmap_buf, sizeof(bitmap_buf)));
   ntop->getTrace()->traceEvent(TRACE_NORMAL, "Hosts bitmap: %s",
   enabled_host_pools.toHexString(bitmap_buf, sizeof(bitmap_buf)));
   ntop->getTrace()->traceEvent(TRACE_NORMAL, "Entities bitmap: %s",
@@ -7392,13 +7386,14 @@ static int ntop_recipient_register(lua_State *vm) {
   enabled_other_alert_types.toHexString(bitmap_buf, sizeof(bitmap_buf)));
   */
 
-  ntop->recipient_register(recipient_id, minimum_severity, enabled_categories,
-                           enabled_host_pools, enabled_entities, enabled_flow_alert_types,
-                           enabled_host_alert_types, enabled_other_alert_types, match_alert_id, skip_alerts);
+  ntop->recipient_register(
+      recipient_id, minimum_severity, enabled_categories, enabled_host_pools,
+      enabled_entities, enabled_flow_alert_types, enabled_host_alert_types,
+      enabled_other_alert_types, match_alert_id, skip_alerts);
 
   lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* **************************************************************** */
@@ -7407,12 +7402,12 @@ static int ndpi_is_custom_application(lua_State *vm) {
   int app_id;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   app_id = lua_tonumber(vm, 1);
 
   lua_pushboolean(vm, app_id >= NDPI_MAX_SUPPORTED_PROTOCOLS);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7423,9 +7418,9 @@ static int ntop_exec_single_sql_query(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((sql = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
 #ifdef HAVE_MYSQL
   NetworkInterface *curr_iface = getCurrentInterface(vm);
@@ -7433,9 +7428,9 @@ static int ntop_exec_single_sql_query(lua_State *vm) {
 
   db.exec_single_query(vm, sql);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 #else
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 #endif
 }
 
@@ -7449,16 +7444,16 @@ static int ntop_exec_cmd(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((cmd = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   rc = Utils::execCmd(cmd, &out);
 
-  if(rc)
-    lua_pushstring(vm, out.c_str());
+  if (rc) lua_pushstring(vm, out.c_str());
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, rc ? CONST_LUA_OK : CONST_LUA_ERROR));
+  return (ntop_lua_return_value(vm, __FUNCTION__,
+                                rc ? CONST_LUA_OK : CONST_LUA_ERROR));
 }
 
 /* ****************************************** */
@@ -7472,18 +7467,19 @@ static int ntop_exec_cmd_async(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   if ((cmd = (char *)lua_tostring(vm, 1)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   rc = jq->queueJob(cmd, &id);
 
-  if(rc)
+  if (rc)
     lua_pushnumber(vm, (lua_Number)id);
   else
     lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, rc ? CONST_LUA_OK : CONST_LUA_ERROR));
+  return (ntop_lua_return_value(vm, __FUNCTION__,
+                                rc ? CONST_LUA_OK : CONST_LUA_ERROR));
 }
 
 /* ****************************************** */
@@ -7497,18 +7493,19 @@ static int ntop_read_result_cmd_async(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   else
     id = (u_int32_t)lua_tonumber(vm, 1);
 
   rc = jq->getJobResult(id, &out);
 
-  if(rc)
+  if (rc)
     lua_pushstring(vm, out.c_str());
   else
     lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, rc ? CONST_LUA_OK : CONST_LUA_ERROR));
+  return (ntop_lua_return_value(vm, __FUNCTION__,
+                                rc ? CONST_LUA_OK : CONST_LUA_ERROR));
 }
 
 /* ****************************************** */
@@ -7520,22 +7517,22 @@ static int ntop_reload_device_protocols(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TTABLE) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   device_type = (DeviceType)lua_tointeger(vm, 1);
   if ((dir = (char *)lua_tostring(vm, 2)) == NULL)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   ntop->refreshAllowedProtocolPresets(device_type, !!strcmp(dir, "server"), vm,
                                       3);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7546,7 +7543,7 @@ static int ntop_get_asn_name(lua_State *vm) {
   u_int32_t asn = 0;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   a.set((char *)lua_tostring(vm, 1));
 
@@ -7557,7 +7554,7 @@ static int ntop_get_asn_name(lua_State *vm) {
     free(as_name);
   }
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7568,7 +7565,7 @@ static int ntop_get_host_geolocation(lua_State *vm) {
   float latitude = 0, longitude = 0;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
 
   ip.set((char *)lua_tostring(vm, 1));
 
@@ -7585,7 +7582,7 @@ static int ntop_get_host_geolocation(lua_State *vm) {
 
   ntop->getGeolocation()->freeInfo(&continent, &country_name, &city);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7597,10 +7594,10 @@ static int ntop_get_ndpi_protocol_category(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (!curr_iface)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   proto = (u_int)lua_tonumber(vm, 1);
 
   ndpi_protocol_category_t category = ntop->get_ndpi_proto_category(proto);
@@ -7610,7 +7607,7 @@ static int ntop_get_ndpi_protocol_category(lua_State *vm) {
   lua_push_str_table_entry(
       vm, "name", (char *)curr_iface->get_ndpi_category_name(category));
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7621,18 +7618,18 @@ static int ntop_set_ndpi_protocol_category(lua_State *vm) {
   ndpi_protocol_category_t category;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   proto = (u_int16_t)lua_tonumber(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   category = (ndpi_protocol_category_t)lua_tointeger(vm, 2);
 
   ntop->setnDPIProtocolCategory(proto, category);
 
   lua_pushnil(vm);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7643,14 +7640,14 @@ static int ntop_override_interface(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   ifname = (char *)lua_tostring(vm, 1);
 
   ntop->getPrefs()->resetDeferredInterfacesToRegister();
   ntop->getPrefs()->addDeferredInterfaceToRegister(ifname);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7662,13 +7659,13 @@ static int ntop_add_lan_interface(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   lan_ifname = (char *)lua_tostring(vm, 1);
 
   ntop->getPrefs()->add_lan_interface(lan_ifname);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7678,13 +7675,13 @@ static int ntop_add_wan_interface(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   lan_ifname = (char *)lua_tostring(vm, 1);
 
   ntop->getPrefs()->add_wan_interface(lan_ifname);
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* ****************************************** */
@@ -7695,7 +7692,7 @@ static int ntop_refresh_device_protocols_policies_pref(lua_State *vm) {
   ntop->getPrefs()->refreshDeviceProtocolsPolicyPref();
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 #endif
@@ -7709,12 +7706,12 @@ static int ntop_add_bin(lua_State *vm) {
   if (ctx) {
     if (ctx->bin == NULL) ctx->bin = new (std::nothrow) BinAnalysis();
 
-    if (ctx->bin) return(ctx->bin->addBin(vm));
+    if (ctx->bin) return (ctx->bin->addBin(vm));
   }
 #endif
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* **************************************************************** */
@@ -7724,12 +7721,12 @@ static int ntop_find_bin_similarities(lua_State *vm) {
   NtopngLuaContext *ctx = getLuaVMContext(vm);
 
   if (ctx && ctx->bin) {
-    return(ctx->bin->findSimilarities(vm));
+    return (ctx->bin->findSimilarities(vm));
   }
 #endif
 
   lua_pushnil(vm);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* **************************************************************** */
@@ -7738,7 +7735,7 @@ static int ntop_check_nprobe_ips_configured(lua_State *vm) {
   lua_pushboolean(vm,
                   (ntop->getPrefs()->getZMQPublishEventsURL() ? true : false));
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* **************************************************************** */
@@ -7748,7 +7745,7 @@ static int ntop_pools_lock(lua_State *vm) {
   struct timespec wait;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   max_lock_duration = lua_tonumber(vm, 1);
 
   if (max_lock_duration > 10) max_lock_duration = 10;
@@ -7756,7 +7753,7 @@ static int ntop_pools_lock(lua_State *vm) {
   wait.tv_sec = max_lock_duration, wait.tv_nsec = 0;
   lua_pushboolean(
       vm, ntop->get_pools_lock()->lockTimeout(__FILE__, __LINE__, &wait));
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* **************************************************************** */
@@ -7765,7 +7762,7 @@ static int ntop_pools_unlock(lua_State *vm) {
   ntop->get_pools_lock()->unlock(__FILE__, __LINE__);
   lua_pushboolean(vm, true);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* **************************************************************** */
@@ -7773,7 +7770,7 @@ static int ntop_pools_unlock(lua_State *vm) {
 static int ntop_toggle_new_delete_trace(lua_State *vm) {
   trace_new_delete = !trace_new_delete;
   lua_pushboolean(vm, trace_new_delete);
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* **************************************************************** */
@@ -7782,8 +7779,10 @@ static int ntop_get_license_limits(lua_State *vm) {
   lua_newtable(vm);
 
   lua_newtable(vm);
-  lua_push_uint32_table_entry(vm, "num_flow_exporters", ntop->getNumFlowExporters());
-  lua_push_uint32_table_entry(vm, "num_flow_exporter_interfaces", ntop->getNumFlowExportersInterfaces());
+  lua_push_uint32_table_entry(vm, "num_flow_exporters",
+                              ntop->getNumFlowExporters());
+  lua_push_uint32_table_entry(vm, "num_flow_exporter_interfaces",
+                              ntop->getNumFlowExportersInterfaces());
 #if 0
   lua_push_uint32_table_entry(vm, "num_host_pools", );
   lua_push_uint32_table_entry(vm, "num_pool_members", );
@@ -7795,8 +7794,10 @@ static int ntop_get_license_limits(lua_State *vm) {
 
   lua_newtable(vm);
 #ifdef NTOPNG_PRO
-  lua_push_uint32_table_entry(vm, "num_flow_exporters", get_max_num_flow_exporters());
-  lua_push_uint32_table_entry(vm, "num_flow_exporter_interfaces", get_max_num_flow_exporters_interfaces());
+  lua_push_uint32_table_entry(vm, "num_flow_exporters",
+                              get_max_num_flow_exporters());
+  lua_push_uint32_table_entry(vm, "num_flow_exporter_interfaces",
+                              get_max_num_flow_exporters_interfaces());
 #endif
   lua_push_uint32_table_entry(vm, "num_host_pools", MAX_NUM_HOST_POOLS);
   lua_push_uint32_table_entry(vm, "num_pool_members", MAX_NUM_POOL_MEMBERS);
@@ -7805,46 +7806,46 @@ static int ntop_get_license_limits(lua_State *vm) {
   lua_insert(vm, -2);
   lua_settable(vm, -3);
 
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 #if defined(NTOPNG_PRO)
 
 /* **************************************************************** */
 
-static int m_broker_publish(lua_State  *vm) {
+static int m_broker_publish(lua_State *vm) {
   char *topic, *message;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   topic = (char *)lua_tostring(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   message = (char *)lua_tostring(vm, 2);
 
   MessageBroker *message_broker = ntop->getMessageBroker();
   if (!message_broker)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
-  if (message_broker->publish(topic,message))
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  if (message_broker->publish(topic, message))
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   else
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 }
 
 /* **************************************************************** */
 
-static int m_broker_rpc_call(lua_State  *vm) {
+static int m_broker_rpc_call(lua_State *vm) {
   char *topic, *message, rsp[BROKER_RPC_CALL_MAX_RSP_LEN];
   u_int64_t timeout_ms;
 
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   topic = (char *)lua_tostring(vm, 1);
 
   if (ntop_lua_check(vm, __FUNCTION__, 2, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   message = (char *)lua_tostring(vm, 2);
 
   if (ntop_lua_check(vm, __FUNCTION__, 3, LUA_TNUMBER) != CONST_LUA_OK)
@@ -7855,14 +7856,15 @@ static int m_broker_rpc_call(lua_State  *vm) {
   MessageBroker *message_broker = ntop->getMessageBroker();
 
   if (!message_broker)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
 
-  if (message_broker->rpcCall(topic, message, timeout_ms,(char*) rsp, BROKER_RPC_CALL_MAX_RSP_LEN)) {
+  if (message_broker->rpcCall(topic, message, timeout_ms, (char *)rsp,
+                              BROKER_RPC_CALL_MAX_RSP_LEN)) {
     lua_newtable(vm);
     lua_push_str_table_entry(vm, "broker_rsp", rsp);
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
   } else {
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   }
 }
 
@@ -7872,505 +7874,505 @@ static int m_broker_rpc_call(lua_State  *vm) {
 
 static int read_modbus_device_info(lua_State *vm) {
   char *device_ip;
-  int timeout  = 5;
+  int timeout = 5;
   bool rc;
-  
+
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   else
     device_ip = (char *)lua_tostring(vm, 1);
-  
+
   if (lua_type(vm, 2) == LUA_TNUMBER) timeout = (u_int16_t)lua_tonumber(vm, 2);
-  
+
   rc = Utils::readModbusDeviceInfo(device_ip, timeout, vm);
 
-  if(rc == false) {
+  if (rc == false) {
     lua_pushnil(vm);
-    
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   } else
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* **************************************************************** */
 
 static int read_ether_ip_device_info(lua_State *vm) {
   char *device_ip;
-  int timeout  = 5;
+  int timeout = 5;
   bool rc;
-  
+
   if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_PARAM_ERROR));
   else
     device_ip = (char *)lua_tostring(vm, 1);
-  
+
   if (lua_type(vm, 2) == LUA_TNUMBER) timeout = (u_int16_t)lua_tonumber(vm, 2);
-  
+
   rc = Utils::readEthernetIPDeviceInfo(device_ip, timeout, vm);
 
-  if(rc == false) {
+  if (rc == false) {
     lua_pushnil(vm);
-    
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
+
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   } else
-    return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+    return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* **************************************************************** */
 
 static int reload_servers_configuration(lua_State *vm) {
   ntop->getPrefs()->reloadServersConfiguration();
-  return(ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
+  lua_pushnil(vm);
+  return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_OK));
 }
 
 /* **************************************************************** */
 
 static luaL_Reg _ntop_reg[] = {
-    { "getDirs", ntop_get_dirs},
-    { "getInfo", ntop_get_info},
-    { "getUptime", ntop_get_uptime},
-    { "dumpFile", ntop_dump_file},
-    { "dumpBinaryFile", ntop_dump_binary_file},
-    { "checkLicense", ntop_check_license},
-    { "systemHostStat", ntop_system_host_stat},
-    { "getSystemAlertsStats", ntop_get_system_alerts_stats},
-    { "refreshCPULoad", ntop_refresh_cpu_load},
-    { "getCookieAttributes", ntop_get_cookie_attributes},
-    { "isAllowedInterface", ntop_is_allowed_interface},
-    { "isAllowedNetwork", ntop_is_allowed_network},
-    { "isLocalInterfaceAddress", ntop_is_local_interface_address},
-    { "isLocalAddress", ntop_is_local_address},
-    { "md5", ntop_md5},
-    { "hasRadiusSupport", ntop_has_radius_support},
-    { "hasLdapSupport", ntop_has_ldap_support},
-    { "execSingleSQLQuery", ntop_exec_single_sql_query},
-    { "resetStats", ntop_reset_stats},
-    { "getCurrentScriptsDir", ntop_get_current_scripts_dir},
-    { "getDropPoolInfo", ntop_get_drop_pool_info},
-    { "isOffline", ntop_is_offline},
-    { "isForcedOffline", ntop_is_forced_offline},
-    { "setOffline", ntop_set_offline},
-    { "setOnline", ntop_set_online},
-    { "isShuttingDown", ntop_is_shutting_down},
-    { "limitResourcesUsage", ntop_limit_resources_usage},
+    {"getDirs", ntop_get_dirs},
+    {"getInfo", ntop_get_info},
+    {"getUptime", ntop_get_uptime},
+    {"dumpFile", ntop_dump_file},
+    {"dumpBinaryFile", ntop_dump_binary_file},
+    {"checkLicense", ntop_check_license},
+    {"systemHostStat", ntop_system_host_stat},
+    {"getSystemAlertsStats", ntop_get_system_alerts_stats},
+    {"refreshCPULoad", ntop_refresh_cpu_load},
+    {"getCookieAttributes", ntop_get_cookie_attributes},
+    {"isAllowedInterface", ntop_is_allowed_interface},
+    {"isAllowedNetwork", ntop_is_allowed_network},
+    {"isLocalInterfaceAddress", ntop_is_local_interface_address},
+    {"isLocalAddress", ntop_is_local_address},
+    {"md5", ntop_md5},
+    {"hasRadiusSupport", ntop_has_radius_support},
+    {"hasLdapSupport", ntop_has_ldap_support},
+    {"execSingleSQLQuery", ntop_exec_single_sql_query},
+    {"resetStats", ntop_reset_stats},
+    {"getCurrentScriptsDir", ntop_get_current_scripts_dir},
+    {"getDropPoolInfo", ntop_get_drop_pool_info},
+    {"isOffline", ntop_is_offline},
+    {"isForcedOffline", ntop_is_forced_offline},
+    {"setOffline", ntop_set_offline},
+    {"setOnline", ntop_set_online},
+    {"isShuttingDown", ntop_is_shutting_down},
+    {"limitResourcesUsage", ntop_limit_resources_usage},
 
     /* Execute commands */
-    { "execCmd", ntop_exec_cmd},
-    { "execCmdAsync", ntop_exec_cmd_async},
-    { "readResultCmdAsync", ntop_read_result_cmd_async},
+    {"execCmd", ntop_exec_cmd},
+    {"execCmdAsync", ntop_exec_cmd_async},
+    {"readResultCmdAsync", ntop_read_result_cmd_async},
 
     /* Redis */
-    { "getCacheStatus", ntop_info_redis},
-    { "getCache", ntop_get_redis},
-    { "setCache", ntop_set_redis},
-    { "setnxCache", ntop_setnx_redis},
-    { "incrCache", ntop_incr_redis},
-    { "getCacheStats", ntop_get_redis_stats},
-    { "delCache", ntop_delete_redis_key},
-    { "flushCache", ntop_flush_redis},
-    { "listIndexCache", ntop_list_index_redis},
-    { "lpushCache", ntop_lpush_redis},
-    { "rpushCache", ntop_rpush_redis},
-    { "lpopCache", ntop_lpop_redis},
-    { "rpopCache", ntop_rpop_redis},
-    { "lremCache", ntop_lrem_redis},
-    { "ltrimCache", ntop_ltrim_redis},
-    { "lrangeCache", ntop_lrange_redis},
-    { "llenCache", ntop_llen_redis},
-    { "setMembersCache", ntop_add_set_member_redis},
-    { "delMembersCache", ntop_del_set_member_redis},
-    { "getMembersCache", ntop_get_set_members_redis},
-    { "getHashCache", ntop_get_hash_redis},
-    { "setHashCache", ntop_set_hash_redis},
-    { "delHashCache", ntop_delete_hash_redis_key},
-    { "getHashKeysCache", ntop_get_hash_keys_redis},
-    { "getHashAllCache", ntop_get_hash_all_redis},
-    { "getKeysCache", ntop_get_keys_redis},
-    { "hasDumpCache", ntop_redis_has_dump},
-    { "dumpCache", ntop_redis_dump},
-    { "restoreCache", ntop_redis_restore},
-    { "addLocalNetwork", ntop_add_local_network},
-    { "setResolvedAddress", ntop_set_resolved_address},
+    {"getCacheStatus", ntop_info_redis},
+    {"getCache", ntop_get_redis},
+    {"setCache", ntop_set_redis},
+    {"setnxCache", ntop_setnx_redis},
+    {"incrCache", ntop_incr_redis},
+    {"getCacheStats", ntop_get_redis_stats},
+    {"delCache", ntop_delete_redis_key},
+    {"flushCache", ntop_flush_redis},
+    {"listIndexCache", ntop_list_index_redis},
+    {"lpushCache", ntop_lpush_redis},
+    {"rpushCache", ntop_rpush_redis},
+    {"lpopCache", ntop_lpop_redis},
+    {"rpopCache", ntop_rpop_redis},
+    {"lremCache", ntop_lrem_redis},
+    {"ltrimCache", ntop_ltrim_redis},
+    {"lrangeCache", ntop_lrange_redis},
+    {"llenCache", ntop_llen_redis},
+    {"setMembersCache", ntop_add_set_member_redis},
+    {"delMembersCache", ntop_del_set_member_redis},
+    {"getMembersCache", ntop_get_set_members_redis},
+    {"getHashCache", ntop_get_hash_redis},
+    {"setHashCache", ntop_set_hash_redis},
+    {"delHashCache", ntop_delete_hash_redis_key},
+    {"getHashKeysCache", ntop_get_hash_keys_redis},
+    {"getHashAllCache", ntop_get_hash_all_redis},
+    {"getKeysCache", ntop_get_keys_redis},
+    {"hasDumpCache", ntop_redis_has_dump},
+    {"dumpCache", ntop_redis_dump},
+    {"restoreCache", ntop_redis_restore},
+    {"addLocalNetwork", ntop_add_local_network},
+    {"setResolvedAddress", ntop_set_resolved_address},
 
     /* Redis Preferences */
-    { "setPref", ntop_set_preference},
-    { "getPref", ntop_get_redis},
+    {"setPref", ntop_set_preference},
+    {"getPref", ntop_get_redis},
 
-    { "isdir", ntop_is_dir},
-    { "mkdir", ntop_mkdir_tree},
-    { "notEmptyFile", ntop_is_not_empty_file},
-    { "exists", ntop_get_file_dir_exists},
-    { "listReports", ntop_list_reports},
-    { "fileLastChange", ntop_get_file_last_change},
-    { "readdir", ntop_list_dir_files},
-    { "rmdir", ntop_remove_dir_recursively},
-    { "unlink", ntop_unlink_file},
+    {"isdir", ntop_is_dir},
+    {"mkdir", ntop_mkdir_tree},
+    {"notEmptyFile", ntop_is_not_empty_file},
+    {"exists", ntop_get_file_dir_exists},
+    {"listReports", ntop_list_reports},
+    {"fileLastChange", ntop_get_file_last_change},
+    {"readdir", ntop_list_dir_files},
+    {"rmdir", ntop_remove_dir_recursively},
+    {"unlink", ntop_unlink_file},
 
-    { "isNProbeIPSConfigured", ntop_check_nprobe_ips_configured},
+    {"isNProbeIPSConfigured", ntop_check_nprobe_ips_configured},
 
 #ifndef HAVE_NEDGE
 #ifdef HAVE_ZMQ
-    { "zmq_connect", ntop_zmq_connect},
-    { "zmq_disconnect", ntop_zmq_disconnect},
-    { "zmq_receive", ntop_zmq_receive},
+    {"zmq_connect", ntop_zmq_connect},
+    {"zmq_disconnect", ntop_zmq_disconnect},
+    {"zmq_receive", ntop_zmq_receive},
 #endif
 
     /* IPS */
-    { "broadcastIPSMessage", ntop_brodcast_ips_message},
-    { "timeToRefreshIPSRules", ntop_time_to_refresh_ips_rules},
-    { "askToRefreshIPSRules", ntop_ask_to_refresh_ips_rules},
+    {"broadcastIPSMessage", ntop_brodcast_ips_message},
+    {"timeToRefreshIPSRules", ntop_time_to_refresh_ips_rules},
+    {"askToRefreshIPSRules", ntop_ask_to_refresh_ips_rules},
 #endif
 
-    { "reloadPreferences", ntop_reload_preferences},
-    { "setDefaultFilePermissions", ntop_set_default_file_permissions},
+    {"reloadPreferences", ntop_reload_preferences},
+    {"setDefaultFilePermissions", ntop_set_default_file_permissions},
 
 #ifdef NTOPNG_PRO
 #ifndef HAVE_NEDGE
-    { "checkSubInterfaceSyntax", ntop_check_sub_interface_syntax},
-    { "checkFilterSyntax", ntop_check_filter_syntax},
-    { "reloadProfiles", ntop_reload_traffic_profiles},
+    {"checkSubInterfaceSyntax", ntop_check_sub_interface_syntax},
+    {"checkFilterSyntax", ntop_check_filter_syntax},
+    {"reloadProfiles", ntop_reload_traffic_profiles},
 #endif
 #endif
 
-    { "isForcedCommunity", ntop_is_forced_community},
-    { "isPro", ntop_is_pro},
-    { "isEnterprise", ntop_is_enterprise_m},
-    { "isEnterpriseM", ntop_is_enterprise_m},
-    { "isEnterpriseL", ntop_is_enterprise_l},
-    { "isEnterpriseXL", ntop_is_enterprise_xl},
-    { "isEnterpriseXXL", ntop_is_enterprise_xxl},
-    { "isnEdge", ntop_is_nedge},
-    { "isnEdgeEnterprise", ntop_is_nedge_enterprise},
-    { "isPackage", ntop_is_package},
-    { "isAppliance", ntop_is_appliance},
-    { "isIoTBridge", ntop_is_iot_bridge},
+    {"isForcedCommunity", ntop_is_forced_community},
+    {"isPro", ntop_is_pro},
+    {"isEnterprise", ntop_is_enterprise_m},
+    {"isEnterpriseM", ntop_is_enterprise_m},
+    {"isEnterpriseL", ntop_is_enterprise_l},
+    {"isEnterpriseXL", ntop_is_enterprise_xl},
+    {"isEnterpriseXXL", ntop_is_enterprise_xxl},
+    {"isnEdge", ntop_is_nedge},
+    {"isnEdgeEnterprise", ntop_is_nedge_enterprise},
+    {"isPackage", ntop_is_package},
+    {"isAppliance", ntop_is_appliance},
+    {"isIoTBridge", ntop_is_iot_bridge},
 
     /* Historical database */
-    { "insertMinuteSampling", ntop_stats_insert_minute_sampling},
-    { "insertHourSampling", ntop_stats_insert_hour_sampling},
-    { "insertDaySampling", ntop_stats_insert_day_sampling},
-    { "getMinuteSampling", ntop_stats_get_minute_sampling},
-    { "deleteMinuteStatsOlderThan", ntop_stats_delete_minute_older_than},
-    { "deleteHourStatsOlderThan", ntop_stats_delete_hour_older_than},
-    { "deleteDayStatsOlderThan", ntop_stats_delete_day_older_than},
-    { "getMinuteSamplingsFromEpoch",
+    {"insertMinuteSampling", ntop_stats_insert_minute_sampling},
+    {"insertHourSampling", ntop_stats_insert_hour_sampling},
+    {"insertDaySampling", ntop_stats_insert_day_sampling},
+    {"getMinuteSampling", ntop_stats_get_minute_sampling},
+    {"deleteMinuteStatsOlderThan", ntop_stats_delete_minute_older_than},
+    {"deleteHourStatsOlderThan", ntop_stats_delete_hour_older_than},
+    {"deleteDayStatsOlderThan", ntop_stats_delete_day_older_than},
+    {"getMinuteSamplingsFromEpoch",
      ntop_stats_get_samplings_of_minutes_from_epoch},
-    { "getHourSamplingsFromEpoch", ntop_stats_get_samplings_of_hours_from_epoch},
-    { "getDaySamplingsFromEpoch", ntop_stats_get_samplings_of_days_from_epoch},
-    { "getMinuteSamplingsInterval", ntop_stats_get_minute_samplings_interval},
+    {"getHourSamplingsFromEpoch", ntop_stats_get_samplings_of_hours_from_epoch},
+    {"getDaySamplingsFromEpoch", ntop_stats_get_samplings_of_days_from_epoch},
+    {"getMinuteSamplingsInterval", ntop_stats_get_minute_samplings_interval},
 
-    { "deleteOldRRDs", ntop_delete_old_rrd_files},
+    {"deleteOldRRDs", ntop_delete_old_rrd_files},
 
     /* Time */
-    { "gettimemsec", ntop_gettimemsec},
-    { "tzset", ntop_tzset},
-    { "roundTime", ntop_round_time},
+    {"gettimemsec", ntop_gettimemsec},
+    {"tzset", ntop_tzset},
+    {"roundTime", ntop_round_time},
 
     /* Ticks */
-    { "getticks", ntop_getticks},
-    { "gettickspersec", ntop_gettickspersec},
+    {"getticks", ntop_getticks},
+    {"gettickspersec", ntop_gettickspersec},
 
     /* UDP */
-    { "send_udp_data", ntop_send_udp_data},
+    {"send_udp_data", ntop_send_udp_data},
 
     /* TCP */
-    { "send_tcp_data", ntop_send_tcp_data},
+    {"send_tcp_data", ntop_send_tcp_data},
 
     /* IP */
-    { "inet_ntoa", ntop_inet_ntoa},
-    { "networkPrefix", ntop_network_prefix},
+    {"inet_ntoa", ntop_inet_ntoa},
+    {"networkPrefix", ntop_network_prefix},
 
     /* RRD */
-    { "rrd_create", ntop_rrd_create},
-    { "rrd_update", ntop_rrd_update},
-    { "rrd_fetch", ntop_rrd_fetch},
-    { "rrd_fetch_columns", ntop_rrd_fetch_columns},
-    { "rrd_lastupdate", ntop_rrd_lastupdate},
-    { "rrd_tune", ntop_rrd_tune},
-    { "rrd_inc_num_drops", ntop_rrd_inc_num_drops},
+    {"rrd_create", ntop_rrd_create},
+    {"rrd_update", ntop_rrd_update},
+    {"rrd_fetch", ntop_rrd_fetch},
+    {"rrd_fetch_columns", ntop_rrd_fetch_columns},
+    {"rrd_lastupdate", ntop_rrd_lastupdate},
+    {"rrd_tune", ntop_rrd_tune},
+    {"rrd_inc_num_drops", ntop_rrd_inc_num_drops},
 
     /* Prefs */
-    { "getPrefs", ntop_get_prefs},
+    {"getPrefs", ntop_get_prefs},
 
     /* Ping */
-    { "isPingAvailable", ntop_is_ping_available},
-    { "isPingIfaceAvailable", ntop_is_ping_iface_available},
-    { "pingHost", ntop_ping_host},
-    { "collectPingResults", ntop_collect_ping_results},
+    {"isPingAvailable", ntop_is_ping_available},
+    {"isPingIfaceAvailable", ntop_is_ping_iface_available},
+    {"pingHost", ntop_ping_host},
+    {"collectPingResults", ntop_collect_ping_results},
 
     /* HTTP utils */
-    { "httpRedirect", ntop_http_redirect},
-    { "getHttpPrefix", ntop_http_get_prefix},
-    { "getStartupEpoch", ntop_http_get_startup_epoch},
-    { "getStaticFileEpoch", ntop_http_get_static_file_epoch},
-    { "httpPurifyParam", ntop_http_purify_param},
+    {"httpRedirect", ntop_http_redirect},
+    {"getHttpPrefix", ntop_http_get_prefix},
+    {"getStartupEpoch", ntop_http_get_startup_epoch},
+    {"getStaticFileEpoch", ntop_http_get_static_file_epoch},
+    {"httpPurifyParam", ntop_http_purify_param},
 
     /* Admin */
-    { "getNologinUser", ntop_get_nologin_username},
-    { "getUsers", ntop_get_users},
-    { "isAdministrator", ntop_is_administrator},
-    { "isPcapDownloadAllowed", ntop_is_pcap_download_allowed},
-    { "getAllowedNetworks", ntop_get_allowed_networks},
-    { "resetUserPassword", ntop_reset_user_password},
-    { "changeUserRole", ntop_change_user_role},
-    { "changeAllowedNets", ntop_change_allowed_nets},
-    { "changeAllowedIfname", ntop_change_allowed_ifname},
-    { "changeUserHostPool", ntop_change_user_host_pool},
-    { "changeUserFullName", ntop_change_user_full_name},
-    { "changeUserLanguage", ntop_change_user_language},
-    { "changePcapDownloadPermission", ntop_change_user_pcap_download_permission},
-    { "changeHistoricalFlowPermission",
+    {"getNologinUser", ntop_get_nologin_username},
+    {"getUsers", ntop_get_users},
+    {"isAdministrator", ntop_is_administrator},
+    {"isPcapDownloadAllowed", ntop_is_pcap_download_allowed},
+    {"getAllowedNetworks", ntop_get_allowed_networks},
+    {"resetUserPassword", ntop_reset_user_password},
+    {"changeUserRole", ntop_change_user_role},
+    {"changeAllowedNets", ntop_change_allowed_nets},
+    {"changeAllowedIfname", ntop_change_allowed_ifname},
+    {"changeUserHostPool", ntop_change_user_host_pool},
+    {"changeUserFullName", ntop_change_user_full_name},
+    {"changeUserLanguage", ntop_change_user_language},
+    {"changePcapDownloadPermission", ntop_change_user_pcap_download_permission},
+    {"changeHistoricalFlowPermission",
      ntop_change_user_historical_flow_permission},
-    { "changeAlertsPermission", ntop_change_user_alerts_permission},
-    { "addUser", ntop_add_user},
-    { "deleteUser", ntop_delete_user},
-    { "createUserSession", ntop_create_user_session},
-    { "createUserAPIToken", ntop_create_user_api_token},
-    { "getUserAPIToken", ntop_get_user_api_token},
-    { "isLoginDisabled", ntop_is_login_disabled},
-    { "isLoginBlacklisted", ntop_is_login_blacklisted},
-    { "getNetworkNameById", ntop_network_name_by_id},
-    { "getNetworkIdByName", ntop_network_id_by_name},
-    { "getNetworks", ntop_get_networks},
-    { "getAddressNetwork", ntop_get_address_network},
-    { "isGuiAccessRestricted", ntop_is_gui_access_restricted},
-    { "serviceRestart", ntop_service_restart},
-    { "getUserObservationPointId", ntop_get_user_observation_point_id},
-    { "updateRadiusLoginInfo", ntop_update_radius_login_info},
+    {"changeAlertsPermission", ntop_change_user_alerts_permission},
+    {"addUser", ntop_add_user},
+    {"deleteUser", ntop_delete_user},
+    {"createUserSession", ntop_create_user_session},
+    {"createUserAPIToken", ntop_create_user_api_token},
+    {"getUserAPIToken", ntop_get_user_api_token},
+    {"isLoginDisabled", ntop_is_login_disabled},
+    {"isLoginBlacklisted", ntop_is_login_blacklisted},
+    {"getNetworkNameById", ntop_network_name_by_id},
+    {"getNetworkIdByName", ntop_network_id_by_name},
+    {"getNetworks", ntop_get_networks},
+    {"getAddressNetwork", ntop_get_address_network},
+    {"isGuiAccessRestricted", ntop_is_gui_access_restricted},
+    {"serviceRestart", ntop_service_restart},
+    {"getUserObservationPointId", ntop_get_user_observation_point_id},
+    {"updateRadiusLoginInfo", ntop_update_radius_login_info},
 
     /* Security */
-    { "getRandomCSRFValue", ntop_get_csrf_value},
+    {"getRandomCSRFValue", ntop_get_csrf_value},
 
     /* HTTP */
-    { "httpGet", ntop_http_get},
-    { "httpGetAuthToken", ntop_http_get_auth_token},
-    { "httpPost", ntop_http_post},
-    { "httpPostAuthToken", ntop_http_post_auth_token},
-    { "httpPutAuthToken", ntop_http_put_auth_token},
-    { "httpFetch", ntop_http_fetch},
-    { "postHTTPJsonData", ntop_post_http_json_data},
-    { "postHTTPTextFile", ntop_post_http_text_file},
+    {"httpGet", ntop_http_get},
+    {"httpGetAuthToken", ntop_http_get_auth_token},
+    {"httpPost", ntop_http_post},
+    {"httpPostAuthToken", ntop_http_post_auth_token},
+    {"httpPutAuthToken", ntop_http_put_auth_token},
+    {"httpFetch", ntop_http_fetch},
+    {"postHTTPJsonData", ntop_post_http_json_data},
+    {"postHTTPTextFile", ntop_post_http_text_file},
 
 #ifdef HAVE_CURL_SMTP
     /* SMTP */
-    { "sendMail", ntop_send_mail},
+    {"sendMail", ntop_send_mail},
 #endif
 
     /* Address Resolution */
-    { "resolveName",
+    {"resolveName",
      ntop_resolve_address}, /* Note: you should use resolveAddress() to call
                                from Lua */
-    { "getResolvedName",
+    {"getResolvedName",
      ntop_get_resolved_address}, /* Note: you should use getResolvedAddress() to
                                     call from Lua */
-    { "resolveHost", ntop_resolve_host},
+    {"resolveHost", ntop_resolve_host},
 
 /* Logging */
 #ifndef WIN32
-    { "syslog", ntop_syslog},
+    {"syslog", ntop_syslog},
 #endif
-    { "setLoggingLevel", ntop_set_logging_level},
-    { "traceEvent", ntop_trace_event},
-    { "verboseTrace", ntop_verbose_trace},
+    {"setLoggingLevel", ntop_set_logging_level},
+    {"traceEvent", ntop_trace_event},
+    {"verboseTrace", ntop_verbose_trace},
 
     /* SNMP */
-    { "snmpv3available",      ntop_is_libsnmp_available },
-    { "snmpsetavailable",     ntop_is_libsnmp_available },
-    { "snmpgetbulkavailable", ntop_is_libsnmp_available },
-    { "snmpMaxNumEngines",    ntop_snmp_max_num_engines },
-    { "snmpSetBulkMaxNumRepetitions", ntop_snmp_set_bulk_max_repetitions },
-    { "snmpToggleTrapCollection", ntop_snmp_toggle_trap_collection },
+    {"snmpv3available", ntop_is_libsnmp_available},
+    {"snmpsetavailable", ntop_is_libsnmp_available},
+    {"snmpgetbulkavailable", ntop_is_libsnmp_available},
+    {"snmpMaxNumEngines", ntop_snmp_max_num_engines},
+    {"snmpSetBulkMaxNumRepetitions", ntop_snmp_set_bulk_max_repetitions},
+    {"snmpToggleTrapCollection", ntop_snmp_toggle_trap_collection},
 
     /* Synchronous */
-    { "snmpget", ntop_snmpget},
-    { "snmpgetnext", ntop_snmpgetnext},
-    { "snmpgetnextbulk", ntop_snmpgetnextbulk},
-    { "snmpset", ntop_snmpset},
+    {"snmpget", ntop_snmpget},
+    {"snmpgetnext", ntop_snmpgetnext},
+    {"snmpgetnextbulk", ntop_snmpgetnextbulk},
+    {"snmpset", ntop_snmpset},
 
     /* Asynchronous */
-    { "snmpallocasnyncengine", ntop_allocasnyncengine },
-    { "snmpfreeasnycengine",   ntop_freeasnyncengine  },
-    { "snmpgetasync", ntop_snmpgetasync},
-    { "snmpgetnextasync", ntop_snmpgetnextasync},
-    { "snmpgetnextbulkasync", ntop_snmpgetnextbulkasync},
-    { "snmpreadasyncrsp", ntop_snmpreadasyncrsp},
+    {"snmpallocasnyncengine", ntop_allocasnyncengine},
+    {"snmpfreeasnycengine", ntop_freeasnyncengine},
+    {"snmpgetasync", ntop_snmpgetasync},
+    {"snmpgetnextasync", ntop_snmpgetnextasync},
+    {"snmpgetnextbulkasync", ntop_snmpgetnextbulkasync},
+    {"snmpreadasyncrsp", ntop_snmpreadasyncrsp},
 
     /* Batch */
-    { "snmpGetBatch", ntop_snmp_batch_get}, /* v1/v2c/v3 */
-    { "snmpReadResponses", ntop_snmp_read_responses},
+    {"snmpGetBatch", ntop_snmp_batch_get}, /* v1/v2c/v3 */
+    {"snmpReadResponses", ntop_snmp_read_responses},
 
     /* Runtime */
-    { "hasGeoIP",  ntop_has_geoip},
-    { "isWindows", ntop_is_windows},
-    { "isFreeBSD", ntop_is_freebsd},
-    { "isLinux",   ntop_is_linux},
-    { "elasticsearchConnection", ntop_elasticsearch_connection},
-    { "getInstanceName", ntop_get_instance_name},
+    {"hasGeoIP", ntop_has_geoip},
+    {"isWindows", ntop_is_windows},
+    {"isFreeBSD", ntop_is_freebsd},
+    {"isLinux", ntop_is_linux},
+    {"elasticsearchConnection", ntop_elasticsearch_connection},
+    {"getInstanceName", ntop_get_instance_name},
 
     /* Custom Categories, Malicious fingerprints
      * Note: only inteded to be called from housekeeping.lua */
-    { "initnDPIReload", ntop_initnDPIReload},
-    { "finalizenDPIReload", ntop_finalizenDPIReload},
-    { "loadCustomCategoryIp", ntop_loadCustomCategoryIp},
-    { "loadCustomCategoryHost", ntop_loadCustomCategoryHost},
-    { "loadCustomCategoryFile", ntop_loadCustomCategoryFile},
-    { "setDomainMask", ntop_setDomainMask},
-    { "addTrustedIssuerDN", ntop_addTrustedIssuerDN},
+    {"initnDPIReload", ntop_initnDPIReload},
+    {"finalizenDPIReload", ntop_finalizenDPIReload},
+    {"loadCustomCategoryIp", ntop_loadCustomCategoryIp},
+    {"loadCustomCategoryHost", ntop_loadCustomCategoryHost},
+    {"loadCustomCategoryFile", ntop_loadCustomCategoryFile},
+    {"setDomainMask", ntop_setDomainMask},
+    {"addTrustedIssuerDN", ntop_addTrustedIssuerDN},
 
     /* Privileges */
-    { "gainWriteCapabilities", ntop_gainWriteCapabilities},
-    { "dropWriteCapabilities", ntop_dropWriteCapabilities},
+    {"gainWriteCapabilities", ntop_gainWriteCapabilities},
+    {"dropWriteCapabilities", ntop_dropWriteCapabilities},
 
     /* Misc */
-    { "getservbyport", ntop_getservbyport},
-    { "msleep", ntop_msleep},
-    { "tcpProbe", ntop_tcp_probe},
-    { "getMacManufacturer", ntop_get_mac_manufacturer},
-    { "getHostInformation", ntop_get_host_information},
-    { "isShuttingDown", ntop_is_shuttingdown},
-    { "listInterfaces", ntop_list_interfaces},
-    { "ipCmp", ntop_ip_cmp},
-    { "matchCustomCategory", ntop_match_custom_category},
-    { "getTLSVersionName", ntop_get_tls_version_name},
-    { "isIPv6", ntop_is_ipv6},
-    { "getMac64", ntop_get_mac_64},
-    { "reloadFlowChecks", ntop_reload_flow_checks},
-    { "reloadHostChecks", ntop_reload_host_checks},
-    { "reloadAlertExclusions", ntop_reload_alert_exclusions},
-    { "getFlowChecksStats", ntop_get_flow_checks_stats},
-    { "getFlowAlertScore", ntop_get_flow_alert_score},
-    { "getFlowAlertRisk", ntop_get_flow_alert_risk},
-    { "getFlowRiskAlerts", ntop_get_flow_risk_alerts},
-    { "getFlowCheckInfo", ntop_get_flow_check_info},
-    { "getHostCheckInfo", ntop_get_host_check_info},
-    { "shouldResolveHost", ntop_should_resolve_host},
-    { "setIEC104AllowedTypeIDs", ntop_set_iec104_allowed_typeids},
+    {"getservbyport", ntop_getservbyport},
+    {"msleep", ntop_msleep},
+    {"tcpProbe", ntop_tcp_probe},
+    {"getMacManufacturer", ntop_get_mac_manufacturer},
+    {"getHostInformation", ntop_get_host_information},
+    {"isShuttingDown", ntop_is_shuttingdown},
+    {"listInterfaces", ntop_list_interfaces},
+    {"ipCmp", ntop_ip_cmp},
+    {"matchCustomCategory", ntop_match_custom_category},
+    {"getTLSVersionName", ntop_get_tls_version_name},
+    {"isIPv6", ntop_is_ipv6},
+    {"getMac64", ntop_get_mac_64},
+    {"reloadFlowChecks", ntop_reload_flow_checks},
+    {"reloadHostChecks", ntop_reload_host_checks},
+    {"reloadAlertExclusions", ntop_reload_alert_exclusions},
+    {"getFlowChecksStats", ntop_get_flow_checks_stats},
+    {"getFlowAlertScore", ntop_get_flow_alert_score},
+    {"getFlowAlertRisk", ntop_get_flow_alert_risk},
+    {"getFlowRiskAlerts", ntop_get_flow_risk_alerts},
+    {"getFlowCheckInfo", ntop_get_flow_check_info},
+    {"getHostCheckInfo", ntop_get_host_check_info},
+    {"shouldResolveHost", ntop_should_resolve_host},
+    {"setIEC104AllowedTypeIDs", ntop_set_iec104_allowed_typeids},
 #ifdef NTOPNG_PRO
-    { "setModbusAllowedFunctionCodes", ntop_set_modbus_allowed_function_codes},
+    {"setModbusAllowedFunctionCodes", ntop_set_modbus_allowed_function_codes},
 #endif
-    { "getLocalNetworkAlias", ntop_check_local_network_alias},
-    { "getLocalNetworkID", ntop_get_local_network_id},
-    { "getRiskStr", ntop_get_risk_str},
-    { "getRiskList", ntop_get_risk_list},
+    {"getLocalNetworkAlias", ntop_check_local_network_alias},
+    {"getLocalNetworkID", ntop_get_local_network_id},
+    {"getRiskStr", ntop_get_risk_str},
+    {"getRiskList", ntop_get_risk_list},
 
     /* ASN */
-    { "getASName", ntop_get_asn_name},
-    { "getHostGeolocation", ntop_get_host_geolocation},
+    {"getASName", ntop_get_asn_name},
+    {"getHostGeolocation", ntop_get_host_geolocation},
 
     /* Mac */
-    { "setMacDeviceType", ntop_set_mac_device_type},
+    {"setMacDeviceType", ntop_set_mac_device_type},
 
     /* Host pools */
-    { "reloadHostPools", ntop_reload_host_pools},
+    {"reloadHostPools", ntop_reload_host_pools},
 
     /* Device Protocols */
-    { "reloadDeviceProtocols", ntop_reload_device_protocols},
+    {"reloadDeviceProtocols", ntop_reload_device_protocols},
 
     /* Traffic Recording/Extraction */
-    { "runExtraction", ntop_run_extraction},
-    { "stopExtraction", ntop_stop_extraction},
-    { "isExtractionRunning", ntop_is_extraction_running},
-    { "getExtractionStatus", ntop_get_extraction_status},
-    { "runLiveExtraction", ntop_run_live_extraction},
+    {"runExtraction", ntop_run_extraction},
+    {"stopExtraction", ntop_stop_extraction},
+    {"isExtractionRunning", ntop_is_extraction_running},
+    {"getExtractionStatus", ntop_get_extraction_status},
+    {"runLiveExtraction", ntop_run_live_extraction},
 
     /* Bitmap functions */
-    { "bitmapIsSet", ntop_bitmap_is_set},
-    { "bitmapSet", ntop_bitmap_set},
-    { "bitmapClear", ntop_bitmap_clear},
+    {"bitmapIsSet", ntop_bitmap_is_set},
+    {"bitmapSet", ntop_bitmap_set},
+    {"bitmapClear", ntop_bitmap_clear},
 
     /* Score */
-    { "mapScoreToSeverity", ntop_map_score_to_severity},
-    { "mapSeverityToScore", ntop_map_severity_to_score},
+    {"mapScoreToSeverity", ntop_map_score_to_severity},
+    {"mapSeverityToScore", ntop_map_severity_to_score},
 
     /* Alerts */
-    { "alert_store_query", ntop_alert_store_query},
+    {"alert_store_query", ntop_alert_store_query},
 
     /* Alerts queues */
-    { "popInternalAlerts", ntop_pop_internal_alerts},
+    {"popInternalAlerts", ntop_pop_internal_alerts},
 
     /* Recipient queues */
-    { "recipient_enqueue", ntop_recipient_enqueue},
-    { "recipient_dequeue", ntop_recipient_dequeue},
-    { "recipient_stats", ntop_recipient_stats},
-    { "recipient_last_use", ntop_recipient_last_use},
-    { "recipient_delete", ntop_recipient_delete},
-    { "recipient_register", ntop_recipient_register},
+    {"recipient_enqueue", ntop_recipient_enqueue},
+    {"recipient_dequeue", ntop_recipient_dequeue},
+    {"recipient_stats", ntop_recipient_stats},
+    {"recipient_last_use", ntop_recipient_last_use},
+    {"recipient_delete", ntop_recipient_delete},
+    {"recipient_register", ntop_recipient_register},
 
     /* nDPI */
-    { "getnDPIProtoCategory", ntop_get_ndpi_protocol_category},
-    { "setnDPIProtoCategory", ntop_set_ndpi_protocol_category},
-    { "isCustomApplication", ndpi_is_custom_application},
+    {"getnDPIProtoCategory", ntop_get_ndpi_protocol_category},
+    {"setnDPIProtoCategory", ntop_set_ndpi_protocol_category},
+    {"isCustomApplication", ndpi_is_custom_application},
 
 /* nEdge */
 #ifdef HAVE_NEDGE
-    { "setHTTPBindAddr", ntop_set_http_bind_addr},
-    { "setHTTPSBindAddr", ntop_set_https_bind_addr},
-    { "setRoutingMode", ntop_set_routing_mode},
-    { "isRoutingMode", ntop_is_routing_mode},
-    { "addLanInterface", ntop_add_lan_interface},
-    { "addWanInterface", ntop_add_wan_interface},
-    { "refreshDeviceProtocolsPoliciesConf",
+    {"setHTTPBindAddr", ntop_set_http_bind_addr},
+    {"setHTTPSBindAddr", ntop_set_https_bind_addr},
+    {"setRoutingMode", ntop_set_routing_mode},
+    {"isRoutingMode", ntop_is_routing_mode},
+    {"addLanInterface", ntop_add_lan_interface},
+    {"addWanInterface", ntop_add_wan_interface},
+    {"refreshDeviceProtocolsPoliciesConf",
      ntop_refresh_device_protocols_policies_pref},
 #endif
 
     /* Appliance */
-    { "overrideInterface", ntop_override_interface},
+    {"overrideInterface", ntop_override_interface},
 
     /* nEdge and Appliance */
-    { "shutdown", ntop_shutdown},
+    {"shutdown", ntop_shutdown},
 
     /* Periodic scripts (ThreadedActivity.cpp) */
-    { "isDeadlineApproaching", ntop_script_is_deadline_approaching},
-    { "getDeadline", ntop_script_get_deadline},
+    {"isDeadlineApproaching", ntop_script_is_deadline_approaching},
+    {"getDeadline", ntop_script_get_deadline},
 
     /* Speedtest */
-    { "hasSpeedtestSupport", ntop_has_speedtest_support},
-    { "speedtest", ntop_speedtest},
+    {"hasSpeedtestSupport", ntop_has_speedtest_support},
+    {"speedtest", ntop_speedtest},
 
     /* Blacklists */
-    { "getBlacklistStats",   ntop_get_bl_stats},
-    { "resetBlacklistStats", ntop_reset_bl_stats},
+    {"getBlacklistStats", ntop_get_bl_stats},
+    {"resetBlacklistStats", ntop_reset_bl_stats},
 
     /* ClickHouse */
-    { "isClickHouseEnabled", ntop_clickhouse_enabled},
-    { "importClickHouseDumps", ntop_clickhouse_import_dumps},
-    { "getClickHouseStats", ntop_get_clickhouse_stats},
+    {"isClickHouseEnabled", ntop_clickhouse_enabled},
+    {"importClickHouseDumps", ntop_clickhouse_import_dumps},
+    {"getClickHouseStats", ntop_get_clickhouse_stats},
 
     /* Data Binning */
-    { "addBin", ntop_add_bin},
-    { "findSimilarities", ntop_find_bin_similarities},
+    {"addBin", ntop_add_bin},
+    {"findSimilarities", ntop_find_bin_similarities},
 
     /* Pools Lock/Unlock */
-    { "poolsLock", ntop_pools_lock},
-    { "poolsUnlock", ntop_pools_unlock},
+    {"poolsLock", ntop_pools_lock},
+    {"poolsUnlock", ntop_pools_unlock},
 
     /* Register Runtime Interface (PCAP or DB) */
-    { "registerRuntimeInterface", ntop_register_runtime_interface},
+    {"registerRuntimeInterface", ntop_register_runtime_interface},
 
 #if defined(NTOPNG_PRO) && defined(HAVE_KAFKA)
     /* Kafka */
-    { "sendKafkaMessage", ntop_send_kafka_message},
+    {"sendKafkaMessage", ntop_send_kafka_message},
 #endif
 
     /* Debug */
-    { "toggleNewDeleteTrace", ntop_toggle_new_delete_trace },
+    {"toggleNewDeleteTrace", ntop_toggle_new_delete_trace},
 
     /* License */
-    { "getLicenseLimits", ntop_get_license_limits },
-    
+    {"getLicenseLimits", ntop_get_license_limits},
+
 #if defined(NTOPNG_PRO)
     /* TODO: move to message_broker engine */
-    { "publish", m_broker_publish },
-    { "rpcCall", m_broker_rpc_call },
+    {"publish", m_broker_publish},
+    {"rpcCall", m_broker_rpc_call},
 #endif
 
     /* Modbus */
-    { "readModbusDeviceInfo", read_modbus_device_info },
-    { "readEthernetIPDeviceInfo", read_ether_ip_device_info },
+    {"readModbusDeviceInfo", read_modbus_device_info},
+    {"readEthernetIPDeviceInfo", read_ether_ip_device_info},
 
-    { "reloadServersConfiguration", reload_servers_configuration },
-    
-    {NULL, NULL}
-};
+    {"reloadServersConfiguration", reload_servers_configuration},
+
+    {NULL, NULL}};
 
 luaL_Reg *ntop_reg = _ntop_reg;
diff --git a/src/flow_checks/UnexpectedDNSServer.cpp b/src/flow_checks/UnexpectedDNSServer.cpp
index aef364f14485..bc55b2cf4fea 100644
--- a/src/flow_checks/UnexpectedDNSServer.cpp
+++ b/src/flow_checks/UnexpectedDNSServer.cpp
@@ -21,14 +21,24 @@
 
 #include "ntop_includes.h"
 #include "flow_checks_includes.h"
+//#define DEBUG_DNS_SERVER 1
 
 /* ***************************************************** */
 
 bool UnexpectedDNSServer::isAllowedHost(Flow *f) {
-  IpAddress *p = (IpAddress *) getServerIP(f);
+  IpAddress *p = (IpAddress *)getServerIP(f);
 
   if (p == NULL || p->isBroadcastAddress()) return true;
 
+#ifdef DEBUG_DNS_SERVER
+  char buf[64];
+  ntop->getTrace()->traceEvent(
+      TRACE_NORMAL,
+      "Checking Unexpected DNS Server [IP %s] [Is DNS: %s] [Is Configured DNS: "
+      "%s]",
+      p->print(buf, sizeof(buf)), p->isDnsServer() ? "Yes" : "No",
+      ntop->getPrefs()->isDNSServer(p, f->get_vlan_id()) ? "Yes" : "No");
+#endif
   if (p->isDnsServer() && !ntop->getPrefs()->isDNSServer(p, f->get_vlan_id())) {
     return false;
   }