X-Git-Url: https://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=json.c;fp=json.c;h=0d8b5141e3e248517a34d2a6fe7d85c9cb51bc07;hp=c9c63f0eb8dd37a4a5a7f4960d1393f156f3db84;hb=0db8e99319ee2e9798ba7fb58a7666791cf81414;hpb=e48d46c959233c89ccd6ccd411b31704610abb71 diff --git a/json.c b/json.c index c9c63f0..0d8b514 100644 --- a/json.c +++ b/json.c @@ -12,6 +12,7 @@ void write_json_traffic(char *json) { int jsoncount=0; fprintf(f, "{\n"); + for_each(ip, ips) { if( ip->lmsid > 0 @@ -21,11 +22,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))); + 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))); jsoncount++; } }