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

diff --git a/prometheus.c b/prometheus.c
index 3e4cb83..e58677c 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,7 +7,7 @@
 /*  Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
 
-/* Modified by: xChaos, 20120516
+/* Modified by: xChaos, 20120610
                  ludva, 20080415
  
    Prometheus QoS is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@
 
 #include "cll1-0.6.2.h"
 
-const char *version = "0.8.3-d";
+const char *version = "0.8.3-e";
 
 /* Version numbers: 0.8.3 is development releases ("beta"), 0.8.4 will be "stable" */
 /* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */
@@ -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,10 +1653,11 @@ 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);
+     fprintf(f, " \"%s\":{ \"lms\": %d, \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu }",
+                ip->name, ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);
     }
     jsoncount++;
    }
@@ -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