more IPs allowed in identical IPv6 uplink network

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

diff --git a/json.c b/json.c
index c9c63f0eb8dd37a4a5a7f4960d1393f156f3db84..c04a568f955c2995388352cb21c98a2130e7090b 100644 (file)
--- a/json.c
+++ b/json.c
@@ -12,6 +12,7 @@ void write_json_traffic(char *json)
   {\r
    int jsoncount=0;\r
    fprintf(f, "{\n");\r
+\r
    for_each(ip, ips)\r
    {\r
     if(      ip->lmsid > 0 \r
@@ -21,11 +22,13 @@ void write_json_traffic(char *json)
      {\r
       fprintf(f, ",\n");\r
      }\r
-     fprintf(f, " \"%s\":{ \"lms\": %d, \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu,\\r
-                  \"min\":%d, \"max\":%d, \"limit\":%d, \"realquota\":%Lu, \"credit\":%Lu, \"dailyquota\":%ld }",\r
-                ip->name, ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload, \r
-                ip->min, ip->desired, ip->max, ip->realquota, ip->credit, \r
-                (ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));\r
+     fprintf(f, \r
+             " \"%s\":{ \"lms\": %d, \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \\r
+             \"proxy\":%Lu, \"up\":%Lu, \"min\":%d, \"max\":%d, \"limit\":%d, \\r
+             \"pktsup\":%Lu, \"pktsdown\":%Lu, \"realquota\":%Lu, \"credit\":%Lu, \"dailyquota\":%ld }",\r
+             ip->name, ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, \r
+             ip->upload, ip->min, ip->desired, ip->max, ip->pktsup, ip->pktsdown,\r
+             ip->realquota, ip->credit, (ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));\r
      jsoncount++;\r
     }\r
    }\r