X-Git-Url: https://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=json.c;fp=json.c;h=f09f91695f1d0f3b148c234976b2a21ec1a9dd92;hp=c04a568f955c2995388352cb21c98a2130e7090b;hb=296d0585b23ee7c91267d0cb9238dce836106180;hpb=5450cb417ed9adc4abb072f449e2ea4e68d0551e diff --git a/json.c b/json.c index c04a568..f09f916 100644 --- a/json.c +++ b/json.c @@ -15,7 +15,7 @@ void write_json_traffic(char *json) 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) @@ -23,10 +23,10 @@ void write_json_traffic(char *json) fprintf(f, ",\n"); } fprintf(f, - " \"%s\":{ \"lms\": %d, \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \ + " \"%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->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, + 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++;