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

diff --git a/json.c b/json.c
index abf8c4e..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,8 +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 }",
-                ip->name, ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload, ip->min, ip->desired, ip->max);
+     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++;
     }
    }