- fprintf(f, ",\n");\r
- }\r
- if(ip->traffic || ip->direct || ip->proxy || ip->upload)\r
- {\r
- fprintf(f, " %d:{ \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu }",\r
- ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);\r
+ if(jsoncount)\r
+ {\r
+ fprintf(f, ",\n");\r
+ }\r
+ fprintf(f, " \"%s\":{ \"lms\": %d, \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu }",\r
+ ip->name, ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);\r
+ jsoncount++;\r