From 54ceed49e8d9f12d2bb3aa04e320c6f85bebda9a Mon Sep 17 00:00:00 2001
From: Luca Deri <deri@ntop.org>
Date: Thu, 8 Oct 2015 23:42:43 +0200
Subject: [PATCH] Removed invalid warning when parsing flows received via ZMQ
 in case they contain MAC addresses Minor interface stats fix

---
 scripts/lua/if_stats.lua |  2 +-
 src/ParserInterface.cpp  | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/scripts/lua/if_stats.lua b/scripts/lua/if_stats.lua
index fbe054075e..3f1e1b2155 100644
--- a/scripts/lua/if_stats.lua
+++ b/scripts/lua/if_stats.lua
@@ -348,7 +348,7 @@ print [[/lua/iface_local_stats.lua', { ifname: ]] print(ifstats.id .. " }, \"\",
 elseif((page == "packets")) then
    print [[
       <table class="table table-bordered table-striped">
-        <tr><th class="text-center">Size Distribution</th><td colspan=5><div class="pie-chart" id="sizeDistro"></div></td></tr>
+        <tr><th class="text-left">Size Distribution</th><td colspan=5><div class="pie-chart" id="sizeDistro"></div></td></tr>
       </table>
 
         <script type='text/javascript'>
diff --git a/src/ParserInterface.cpp b/src/ParserInterface.cpp
index 8ecee9d854..a32769e0f4 100755
--- a/src/ParserInterface.cpp
+++ b/src/ParserInterface.cpp
@@ -55,9 +55,6 @@ ParserInterface::ParserInterface(const char *endpoint) : NetworkInterface(endpoi
         u_int key_id;
 	json_object *additional_o = json_tokener_parse(value);
 
-	if(additional_o == NULL)
-	  ntop->getTrace()->traceEvent(TRACE_WARNING, "JSON Parse error: %s", value);
-
 	/* FIX: the key can either be numeric of a string */
 	key_id = atoi(key);
 
@@ -83,13 +80,13 @@ ParserInterface::ParserInterface(const char *endpoint) : NetworkInterface(endpoi
         case IN_SRC_MAC:
           /* Format 00:00:00:00:00:00 */
           sscanf(value, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
-           &flow.src_mac[0], &flow.src_mac[1], &flow.src_mac[2],
-           &flow.src_mac[3], &flow.src_mac[4], &flow.src_mac[5]);
+		 &flow.src_mac[0], &flow.src_mac[1], &flow.src_mac[2],
+		 &flow.src_mac[3], &flow.src_mac[4], &flow.src_mac[5]);
           break;
         case OUT_DST_MAC:
           sscanf(value, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
-           &flow.dst_mac[0], &flow.dst_mac[1], &flow.dst_mac[2],
-           &flow.dst_mac[3], &flow.dst_mac[4], &flow.dst_mac[5]);
+		 &flow.dst_mac[0], &flow.dst_mac[1], &flow.dst_mac[2],
+		 &flow.dst_mac[3], &flow.dst_mac[4], &flow.dst_mac[5]);
           break;
         case IPV4_SRC_ADDR:
         case IPV6_SRC_ADDR: