bug fix

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

diff --git a/prometheus.c b/prometheus.c
index 59e2759d421023f2219a156c6993a5f1619cd215..494ce5085b60acedff8d96dbf67f5370ab3b88e1 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -656,8 +656,7 @@ void get_traffic_statistics(void)
      }\r
     }  \r
   }\r
-\r
- free(cmd);\r
+  free(cmd);\r
 }\r
  \r
 /* ========== This function executes, logs OR ALSO prints command ========== */\r
@@ -689,7 +688,7 @@ void run_restore(void)
  string(restor,STRLEN);\r
 \r
  /*-----------------------------------------------------------------*/\r
- printf("Running %s <%s ...\n",iptablesrestore,iptablesfile);\r
+ printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);\r
  /*-----------------------------------------------------------------*/\r
  \r
  save_line("COMMIT");\r
@@ -1643,7 +1642,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     }\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}\n",\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
     }\r
     jsoncount++;\r
@@ -1862,10 +1861,6 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
      {\r
       fprintf(f,"<br />%Lu", sharedip->upload);\r
-      if(!just_preview)\r
-      {\r
-       append_log(sharedip);\r
-      }\r
      }\r
      fputs("</span>\n",f);\r
    }\r
@@ -1897,6 +1892,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    if(!just_preview)\r
    {\r
     append_log(ip);\r
+    for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
+    {\r
+     append_log(sharedip);\r
+    }\r
    }\r
   }\r
   fprintf(f,"</tbody><thead><tr>\n\\r