X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=json.c;h=c04a568f955c2995388352cb21c98a2130e7090b;hp=0d8b5141e3e248517a34d2a6fe7d85c9cb51bc07;hb=bb5e73853e892f8bce70e03344a81b192c2b84ff;hpb=0db8e99319ee2e9798ba7fb58a7666791cf81414

diff --git a/json.c b/json.c
index 0d8b514..c04a568 100644
--- a/json.c
+++ b/json.c
@@ -23,11 +23,12 @@ void write_json_traffic(char *json)
       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)));
+             " \"%s\":{ \"lms\": %d, \"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->lmsid, 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++;
     }
    }