X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=prometheus.c;h=8c70bb0b86e7340f2feff6f13b3a1c47302fc75e;hb=1f13bb8e59cd4f0c1a7bdfcde5599e5c0188d6c2;hp=3e4cb83d65afe46f138939f3df9df3102725c94d;hpb=9690db8ed1b8015caade68d5d074bdd918d21d7b;p=svn%2FPrometheus-QoS%2F.git

diff --git a/prometheus.c b/prometheus.c
index 3e4cb83..8c70bb0 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -610,7 +610,7 @@ void get_traffic_statistics(void)
      {
       printf("(upload) ");
      }
-     printf("IP %s: %Lu M (%ld pkts)\n", ipaddr, traffic, pkts);
+     printf("IP %s: %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts);
 
      if_exists(ip,ips,eq(ip->addr,ipaddr)); 
      else 
@@ -1653,7 +1653,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     {
      fprintf(f, ",\n");
     }
-    if(ip->traffic || ip->direct || ip->proxy || ip->upload)
+    if(     ip->lmsid > 0 
+        && (ip->traffic || ip->direct || ip->proxy || ip->upload))
     {
      fprintf(f, " %d:{ \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu }",
                 ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);
@@ -2183,7 +2184,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   
    if(f)
    {
-     fprintf(f, "%s %d", ip->addr, ip->mark);
+     fprintf(f, "%s %d\n", ip->addr, ip->mark);
    }
   }
   else