X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=json.c;h=f09f91695f1d0f3b148c234976b2a21ec1a9dd92;hb=296d0585b23ee7c91267d0cb9238dce836106180;hp=c9c63f0eb8dd37a4a5a7f4960d1393f156f3db84;hpb=e48d46c959233c89ccd6ccd411b31704610abb71;p=svn%2FPrometheus-QoS%2F.git

diff --git a/json.c b/json.c
index c9c63f0..f09f916 100644
--- a/json.c
+++ b/json.c
@@ -12,20 +12,23 @@ void write_json_traffic(char *json)
   {
    int jsoncount=0;
    fprintf(f, "{\n");
+
    for_each(ip, ips)
    {
-    if(      ip->lmsid > 0 
+    if(      ip->code[0] > 0 
         and (ip->traffic or ip->direct or ip->proxy or ip->upload))
     {
      if(jsoncount)
      {
       fprintf(f, ",\n");
      }
-     fprintf(f, " \"%s\":{ \"lms\": %d, \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu,\
-                  \"min\":%d, \"max\":%d, \"limit\":%d, \"realquota\":%Lu, \"credit\":%Lu, \"dailyquota\":%ld }",
-                ip->name, ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload, 
-                ip->min, ip->desired, ip->max, ip->realquota, ip->credit, 
-                (ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));
+     fprintf(f, 
+             " \"%s\":{ \"code\": %s, \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \
+             \"proxy\":%Lu, \"up\":%Lu, \"min\":%d, \"max\":%d, \"limit\":%d, \
+             \"pktsup\":%Lu, \"pktsdown\":%Lu, \"realquota\":%Lu, \"credit\":%Lu, \"dailyquota\":%ld }",
+             ip->name, ip->code, ip->addr, ip->traffic, ip->direct, ip->proxy, 
+             ip->upload, ip->min, ip->desired, ip->max, ip->pktsup, ip->pktsdown,
+             ip->realquota, ip->credit, (ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));
      jsoncount++;
     }
    }