Fixes LocalHostStats after TCP timeseries changes

ntop · Apr 2, 2019 · d8924af · d8924af
1 parent 61a8ce9
commit d8924af
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/include/LocalHostStats.h b/include/LocalHostStats.h
@@ -43,7 +43,7 @@ class LocalHostStats: public HostStats {
   virtual void updateStats(struct timeval *tv);
   virtual void getJSONObject(json_object *my_object, DetailsLevel details_level);
   virtual void deserialize(json_object *obj);
-  virtual void lua(lua_State* vm, bool mask_host, bool host_details, bool verbose, bool tsLua = false);
+  virtual void lua(lua_State* vm, bool mask_host, DetailsLevel details_level, bool tsLua = false);
   virtual void incNumFlows(bool as_client, Host *peer);
   virtual void decNumFlows(bool as_client, Host *peer);
 

diff --git a/src/HostStats.cpp b/src/HostStats.cpp
@@ -85,7 +85,6 @@ void HostStats::getJSONObject(json_object *my_object, DetailsLevel details_level
 /* *************************************** */
 
 void HostStats::lua(lua_State* vm, bool mask_host, DetailsLevel details_level, bool tsLua) {
-
   if(details_level >= details_high)
     lua_push_uint64_table_entry(vm, "bytes.ndpi.unknown", getnDPIStats() ? getnDPIStats()->getProtoBytes(NDPI_PROTOCOL_UNKNOWN) : 0);
 

diff --git a/src/LocalHostStats.cpp b/src/LocalHostStats.cpp
@@ -115,8 +115,8 @@ void LocalHostStats::getJSONObject(json_object *my_object, DetailsLevel details_
 
 /* *************************************** */
 
-void LocalHostStats::lua(lua_State* vm, bool mask_host, bool host_details, bool verbose, bool tsLua) {
-  HostStats::lua(vm, mask_host, Utils::bool2DetailsLevel(verbose, host_details) ,tsLua);
+void LocalHostStats::lua(lua_State* vm, bool mask_host, DetailsLevel details_level, bool tsLua) {
+  HostStats::lua(vm, mask_host, details_level, tsLua);
 
   if((!mask_host) && top_sites && ntop->getPrefs()->are_top_talkers_enabled()) {
     char *cur_sites = top_sites->json();
@@ -125,14 +125,10 @@ void LocalHostStats::lua(lua_State* vm, bool mask_host, bool host_details, bool
     if(cur_sites) free(cur_sites);
   }
 
-  if(host_details) {
-    if(icmp)
-      icmp->lua(host->get_ip()->isIPv4(), vm);
-  }
-
-  if(verbose) {
-    if(dns)            luaDNS(vm,true);
-    if(http)           http->lua(vm);
+  if(details_level >= details_high) {
+    if(icmp) icmp->lua(host->get_ip()->isIPv4(), vm);
+    if(dns)  luaDNS(vm, true);
+    if(http) http->lua(vm);
   }
 }