json bug fix :-)

[svn/Prometheus-QoS/.git] / prometheus.c

diff --git a/prometheus.c b/prometheus.c
index 3e4cb83d65afe46f138939f3df9df3102725c94d..8c70bb0b86e7340f2feff6f13b3a1c47302fc75e 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -610,7 +610,7 @@ void get_traffic_statistics(void)
      {\r
       printf("(upload) ");\r
      }\r
      {\r
       printf("(upload) ");\r
      }\r

-     printf("IP %s: %Lu M (%ld pkts)\n", ipaddr, traffic, pkts);\r
+     printf("IP %s: %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts);\r

 \r
      if_exists(ip,ips,eq(ip->addr,ipaddr)); \r
      else \r
 \r
      if_exists(ip,ips,eq(ip->addr,ipaddr)); \r
      else \r


@@ -1653,7 +1653,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     {\r
      fprintf(f, ",\n");\r
     }\r
     {\r
      fprintf(f, ",\n");\r
     }\r

-    if(ip->traffic || ip->direct || ip->proxy || ip->upload)\r
+    if(     ip->lmsid > 0 \r
+        && (ip->traffic || ip->direct || ip->proxy || ip->upload))\r

     {\r
      fprintf(f, " %d:{ \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu }",\r
                 ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);\r
     {\r
      fprintf(f, " %d:{ \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu }",\r
                 ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);\r


@@ -2183,7 +2184,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   \r
    if(f)\r
    {\r
   \r
    if(f)\r
    {\r

-     fprintf(f, "%s %d", ip->addr, ip->mark);\r
+     fprintf(f, "%s %d\n", ip->addr, ip->mark);\r

    }\r
   }\r
   else\r
    }\r
   }\r
   else\r