json bug fix :-)

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

diff --git a/prometheus.c b/prometheus.c
index 5288dfe8c8fcdc4fe1890dc1a094e284e756d8e0..8c70bb0b86e7340f2feff6f13b3a1c47302fc75e 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,7 +7,7 @@
 /*  Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */\r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */\r
 \r
 /*  Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */\r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */\r
 \r

-/* Modified by: xChaos, 20120511\r
+/* Modified by: xChaos, 20120516\r

                  ludva, 20080415\r
  \r
    Prometheus QoS is free software; you can redistribute it and/or\r
                  ludva, 20080415\r
  \r
    Prometheus QoS is free software; you can redistribute it and/or\r


@@ -33,21 +33,21 @@
 \r
 #include "cll1-0.6.2.h"\r
 \r
 \r
 #include "cll1-0.6.2.h"\r
 \r

-const char *version = "0.8.3-c";\r
+const char *version = "0.8.3-d";\r

 \r
 /* Version numbers: 0.8.3 is development releases ("beta"), 0.8.4 will be "stable" */\r
 /* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */\r
 /* C source code development versions ("beta"): 0.7.9-a, 0.8.1-b, etc. */\r
 /* C source code release versions: 0.8.0, 0.8.2, 0.8.4, etc. */\r
 \r
 \r
 /* Version numbers: 0.8.3 is development releases ("beta"), 0.8.4 will be "stable" */\r
 /* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */\r
 /* C source code development versions ("beta"): 0.7.9-a, 0.8.1-b, etc. */\r
 /* C source code release versions: 0.8.0, 0.8.2, 0.8.4, etc. */\r
 \r

-const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2012 Michael Polak, <a href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";\r
+const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2012 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";\r

 \r
 /* ======= All path names are defined here (for RPM patch) =======  */\r
 \r
 \r
 /* ======= All path names are defined here (for RPM patch) =======  */\r
 \r

-char              *tc = "/sbin/tc"; /* requires tc with HTB support */\r
-char        *iptables = "/sbin/iptables"; /* requires iptables utility */\r
-char    *iptablessave = "/sbin/iptables-save"; /* not yet required */\r
-char *iptablesrestore = "/sbin/iptables-restore";  /* requires iptables-restore */\r
+const char        *tc = "/sbin/tc"; /* requires tc with HTB support */\r
+const char  *iptables = "/sbin/iptables"; /* requires iptables utility */\r
+const char *iptablessave = "/sbin/iptables-save"; /* not yet required */\r
+const char *iptablesrestore = "/sbin/iptables-restore";  /* requires iptables-restore */\r

 const char        *ls = "/bin/ls"; /* this is not user configurable :-) */\r
 \r
 char          *config = "/etc/prometheus/prometheus.conf"; /* main configuration file */\r
 const char        *ls = "/bin/ls"; /* this is not user configurable :-) */\r
 \r
 char          *config = "/etc/prometheus/prometheus.conf"; /* main configuration file */\r


@@ -55,8 +55,10 @@ char           *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition
 \r
 char    *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/\r
 char          *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */\r
 \r
 char    *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/\r
 char          *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */\r

-char            *html = "/var/www/traffic.html"; /* hall of fame filename */\r
+char        *classmap = "/var/lib/misc/prometheus.classes"; /* credit log file */\r
+char            *html = "/var/www/traffic.html"; /* hall of fame - html version */\r

 char         *preview = "/var/www/preview.html"; /* hall of fame preview */\r
 char         *preview = "/var/www/preview.html"; /* hall of fame preview */\r

+char            *json = "/var/www/traffic.json"; /* hall of fame - json version */\r

 char          *cmdlog = "/var/log/prometheuslog"; /* command log filename */\r
 char         *log_dir = "/var/www/logs/"; /* log directory pathname, ended with slash */\r
 char         *log_url = "/logs/"; /* log directory relative URI prefix (partial URL) */\r
 char          *cmdlog = "/var/log/prometheuslog"; /* command log filename */\r
 char         *log_dir = "/var/www/logs/"; /* log directory pathname, ended with slash */\r
 char         *log_url = "/logs/"; /* log directory relative URI prefix (partial URL) */\r


@@ -67,6 +69,7 @@ char         *lms_url = "/lms/?m=customerinfo&amp;id=";
 int use_jquery_popups = 1;\r
 int      row_odd_even = 0; /*<tr class="odd/even"> */\r
 \r
 int use_jquery_popups = 1;\r
 int      row_odd_even = 0; /*<tr class="odd/even"> */\r
 \r

+\r

 const char *tr_odd_even(void)\r
 {\r
  row_odd_even = 1 - row_odd_even;\r
 const char *tr_odd_even(void)\r
 {\r
  row_odd_even = 1 - row_odd_even;\r


@@ -424,7 +427,7 @@ void get_config(char *config_filename)
   option("iptables",iptables);\r
   option("iptables-save",iptablessave); /* new */\r
   option("iptables-restore",iptablesrestore); /* new */\r
   option("iptables",iptables);\r
   option("iptables-save",iptablessave); /* new */\r
   option("iptables-restore",iptablesrestore); /* new */\r

-  option("iptables-file",iptablesfile); /* new */\r
+  option("iptables-in-filename",iptablesfile); /* new */\r

   option("hosts",hosts);\r
   option("lan-interface",lan);\r
   option("wan-interface",wan);\r
   option("hosts",hosts);\r
   option("lan-interface",lan);\r
   option("wan-interface",wan);\r


@@ -435,9 +438,11 @@ void get_config(char *config_filename)
   ioption("hall-of-fame-enable",hall_of_fame);\r
   option("hall-of-fame-title",title);\r
   option("hall-of-fame-filename",html);\r
   ioption("hall-of-fame-enable",hall_of_fame);\r
   option("hall-of-fame-title",title);\r
   option("hall-of-fame-filename",html);\r

+  option("json-filename",json);\r

   option("hall-of-fame-preview",preview);\r
   option("log-filename",cmdlog);\r
   option("credit-filename",credit);\r
   option("hall-of-fame-preview",preview);\r
   option("log-filename",cmdlog);\r
   option("credit-filename",credit);\r

+  option("classmap-filename",classmap);\r

   ioption("credit-enable",enable_credit);\r
   option("log-traffic-directory",log_dir);\r
   option("log-traffic-html-directory",html_log_dir);\r
   ioption("credit-enable",enable_credit);\r
   option("log-traffic-directory",log_dir);\r
   option("log-traffic-html-directory",html_log_dir);\r


@@ -474,7 +479,7 @@ void get_config(char *config_filename)
  done;\r
  printf("\n");\r
  \r
  done;\r
  printf("\n");\r
  \r

- /*leaf discipline for keywords*/\r
+ /* leaf discipline for keywords */\r

  for_each(keyword,keywords)\r
  {\r
     if(!strcmpi(keyword->leaf_discipline, ""))\r
  for_each(keyword,keywords)\r
  {\r
     if(!strcmpi(keyword->leaf_discipline, ""))\r


@@ -605,7 +610,7 @@ void get_traffic_statistics(void)
      {\r
       printf("(upload) ");\r
      }\r
      {\r
       printf("(upload) ");\r
      }\r

-     printf("IP %s: %Lu M (%ld pkts)\n", ipaddr, traffic, pkts);\r
+     printf("IP %s: %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts);\r

 \r
      if_exists(ip,ips,eq(ip->addr,ipaddr)); \r
      else \r
 \r
      if_exists(ip,ips,eq(ip->addr,ipaddr)); \r
      else \r


@@ -651,8 +656,7 @@ void get_traffic_statistics(void)
      }\r
     }  \r
   }\r
      }\r
     }  \r
   }\r

-\r
- free(cmd);\r
+  free(cmd);\r

 }\r
  \r
 /* ========== This function executes, logs OR ALSO prints command ========== */\r
 }\r
  \r
 /* ========== This function executes, logs OR ALSO prints command ========== */\r


@@ -684,7 +688,7 @@ void run_restore(void)
  string(restor,STRLEN);\r
 \r
  /*-----------------------------------------------------------------*/\r
  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
  /*-----------------------------------------------------------------*/\r
  \r
  save_line("COMMIT");\r


@@ -897,7 +901,7 @@ void parse_ip_log(int argc, char **argv)
  sprintf(str,"%s/%s-%s.html",html_log_dir,year,month);\r
  printf("Writing %s ... ",str);\r
  f=fopen(str,"w");\r
  sprintf(str,"%s/%s-%s.html",html_log_dir,year,month);\r
  printf("Writing %s ... ",str);\r
  f=fopen(str,"w");\r

- if(f)\r
+ if(f > 0)\r

  {\r
   fprintf(f, "<table class=\"decorated last\"><thead>\n\\r
 <tr><th colspan=\"2\">%s %s</th>\n\\r
  {\r
   fprintf(f, "<table class=\"decorated last\"><thead>\n\\r
 <tr><th colspan=\"2\">%s %s</th>\n\\r


@@ -913,13 +917,13 @@ void parse_ip_log(int argc, char **argv)
    if(iplog->traffic)\r
    {\r
     fprintf(f, "%s<td style=\"text-align: right\">%d</td>\n\\r
    if(iplog->traffic)\r
    {\r
     fprintf(f, "%s<td style=\"text-align: right\">%d</td>\n\\r

-<td style=\"text-align: left\"><a class=\"blue\" href=\"%s%s.log\">%s</td>\n\\r
+<td style=\"text-align: left\"><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</td>\n\\r

 <td style=\"text-align: right\">", \r
                tr_odd_even(), i++, log_url, iplog->name, iplog->name);  \r
     if(iplog->lmsid > 0)\r
     {\r
      /*base URL will be configurable soon ... */\r
 <td style=\"text-align: right\">", \r
                tr_odd_even(), i++, log_url, iplog->name, iplog->name);  \r
     if(iplog->lmsid > 0)\r
     {\r
      /*base URL will be configurable soon ... */\r

-     fprintf(f, "<a  class=\"blue\"  href=\"%s%d\">%04d</a>\n", lms_url, iplog->lmsid, iplog->lmsid);\r
+     fprintf(f, "<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, iplog->lmsid, iplog->lmsid);\r

     }\r
     else if(iplog->lmsid == 0)\r
     {\r
     }\r
     else if(iplog->lmsid == 0)\r
     {\r


@@ -934,11 +938,11 @@ void parse_ip_log(int argc, char **argv)
     iplog->l=total;\r
    }\r
   }\r
     iplog->l=total;\r
    }\r
   }\r

-  fprintf(f,"<tr>\\r
-  <td colspan=\"4\" style=\"text-align: left\">Total:</td>\\r
-  <td style=\"text-align: right\"><strong>%ld&nbsp;GB</strong></td>\\r
-  <td style=\"text-align: right\"><strong>%Ld&nbsp;kb/s</strong></td></tr>\n", total, line);\r
-  fputs("</tbody></table>\n", f);\r
+  fprintf(f,"</tbody><thead><tr>\\r
+  <th colspan=\"3\" style=\"text-align: left\">Total:</th>\\r
+  <th colspan=\"2\" style=\"text-align: right\"><strong>%ld&nbsp;GB</strong></th>\\r
+  <th style=\"text-align: right\"><strong>%Ld&nbsp;kb/s</strong></th></tr>\n", total, line);\r
+  fputs("</thead></table>\n", f);\r

 \r
   row_odd_even = 0;\r
   if(i>10)\r
 \r
   row_odd_even = 0;\r
   if(i>10)\r


@@ -954,7 +958,11 @@ void parse_ip_log(int argc, char **argv)
    if_exists(iplog,iplogs,iplog->l>=total/4)\r
    {\r
     fprintf(f,"%s<td>Top 25%% of traffic</td>\n", tr_odd_even());\r
    if_exists(iplog,iplogs,iplog->l>=total/4)\r
    {\r
     fprintf(f,"%s<td>Top 25%% of traffic</td>\n", tr_odd_even());\r

-    fprintf(f,"<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d %%</td><td style=\"text-align: right\">%ld G</td><td style=\"text-align: right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%ld GB</td>\n\\r
+<td style=\"text-align: right\">%d %%</td></tr>\n",\r
+              iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));\r

    }\r
    \r
    if_exists(iplog,iplogs,iplog->i==10)\r
    }\r
    \r
    if_exists(iplog,iplogs,iplog->i==10)\r


@@ -962,9 +970,9 @@ void parse_ip_log(int argc, char **argv)
     fprintf(f,"%s<td>Top 10 downloaders</td>\n", tr_odd_even());\r
     fprintf(f,"<td style=\"text-align: right\"><strong>10</strong></td>\n\\r
 <td style=\"text-align: right\">%d %%</td>\n\\r
     fprintf(f,"%s<td>Top 10 downloaders</td>\n", tr_odd_even());\r
     fprintf(f,"<td style=\"text-align: right\"><strong>10</strong></td>\n\\r
 <td style=\"text-align: right\">%d %%</td>\n\\r

-<td style=\"text-align: right\">%ld G</td>\n\\r
+<td style=\"text-align: right\">%ld GB</td>\n\\r

 <td style=\"text-align: right\">%d %%</td></tr>\n",\r
 <td style=\"text-align: right\">%d %%</td></tr>\n",\r

-               (100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+               (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));\r

    }\r
 \r
    if_exists(iplog,iplogs,iplog->l>=total/2)\r
    }\r
 \r
    if_exists(iplog,iplogs,iplog->l>=total/2)\r


@@ -972,7 +980,7 @@ void parse_ip_log(int argc, char **argv)
     fprintf(f,"%s<td>Top 50%% of traffic</td>\n", tr_odd_even());\r
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
 <td style=\"text-align: right\">%d %%</td>\n\\r
     fprintf(f,"%s<td>Top 50%% of traffic</td>\n", tr_odd_even());\r
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
 <td style=\"text-align: right\">%d %%</td>\n\\r

-<td style=\"text-align: right\">%ld G</td>\n\\r
+<td style=\"text-align: right\">%ld GB</td>\n\\r

 <td style=\"text-align: right\"><strong>%d %%</strong></td></tr>\n",\r
               iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
    }\r
 <td style=\"text-align: right\"><strong>%d %%</strong></td></tr>\n",\r
               iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
    }\r


@@ -982,9 +990,9 @@ void parse_ip_log(int argc, char **argv)
     fprintf(f,"%s<td>Top 80%% of traffic</td>\n",tr_odd_even());\r
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
 <td style=\"text-align: right\">%d %%</td>\n\\r
     fprintf(f,"%s<td>Top 80%% of traffic</td>\n",tr_odd_even());\r
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
 <td style=\"text-align: right\">%d %%</td>\n\\r

-<td style=\"text-align: right\">%ld G</td>\n\\r
+<td style=\"text-align: right\">%ld GB</td>\n\\r

 <td style=\"text-align: right\"><strong>%d %%</strong></td></tr>\n",\r
 <td style=\"text-align: right\"><strong>%d %%</strong></td></tr>\n",\r

-              iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+              iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));\r

    }\r
 \r
    if_exists (iplog,iplogs,iplog->i>=i/5)\r
    }\r
 \r
    if_exists (iplog,iplogs,iplog->i>=i/5)\r


@@ -992,15 +1000,19 @@ void parse_ip_log(int argc, char **argv)
     fprintf(f,"%s<td>Top 20%% downloaders</td>\n",tr_odd_even());\r
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
 <td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r
     fprintf(f,"%s<td>Top 20%% downloaders</td>\n",tr_odd_even());\r
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
 <td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r

-<td style=\"text-align: right\">%ld G</td>\n\\r
+<td style=\"text-align: right\">%ld GB</td>\n\\r

 <td style=\"text-align: right\">%d %%</td></tr>\n",\r
 <td style=\"text-align: right\">%d %%</td></tr>\n",\r

-              iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+              iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));\r

    }\r
 \r
    if_exists(iplog,iplogs,iplog->i>=i/4)\r
    {\r
     fprintf(f,"%s<td>Top 25%% downloaders</td>\n", tr_odd_even());\r
    }\r
 \r
    if_exists(iplog,iplogs,iplog->i>=i/4)\r
    {\r
     fprintf(f,"%s<td>Top 25%% downloaders</td>\n", tr_odd_even());\r

-    fprintf(f,"<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d %%</td><td style=\"text-align: right\">%ld G</td><td style=\"text-align: right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%ld GB</td>\n\\r
+<td style=\"text-align: right\">%d %%</td></tr>\n",\r
+               iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));\r

    }\r
 \r
    if_exists(iplog,iplogs,iplog->i>=i/2)\r
    }\r
 \r
    if_exists(iplog,iplogs,iplog->i>=i/2)\r


@@ -1008,27 +1020,32 @@ void parse_ip_log(int argc, char **argv)
     fprintf(f,"%s<td>Top 50%% downloaders</td>\n",tr_odd_even());\r
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
 <td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r
     fprintf(f,"%s<td>Top 50%% downloaders</td>\n",tr_odd_even());\r
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
 <td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r

-<td style=\"text-align: right\">%ld G</td><td style=\"text-align: right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+<td style=\"text-align: right\">%ld GB</td>\n\\r
+<td style=\"text-align: right\">%d %%</td></tr>\n",\r
+              iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));\r

    }\r
 \r
    if_exists(iplog,iplogs,iplog->i>=4*i/5)\r
    {\r
     fprintf(f,"%s<td>Top 80%% downloaders</td>\n",tr_odd_even());\r
    }\r
 \r
    if_exists(iplog,iplogs,iplog->i>=4*i/5)\r
    {\r
     fprintf(f,"%s<td>Top 80%% downloaders</td>\n",tr_odd_even());\r

-    fprintf(f,"<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d %%</td><td style=\"text-align: right\">%ld G</td><td style=\"text-align: right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%ld GB</td>\n\\r
+<td style=\"text-align: right\">%d %%</td></tr>\n",\r
+              iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));\r

    }\r
 \r
    }\r
 \r

-   fprintf(f,"</tbody><thead><tr>\n\\r
-<th>All users, all traffic</th>\n\\r
-<th style=\"text-align: right\">%d</th>\n\\r
+   fprintf(f,"</tbody><thead><tr><th><a class=\"blue\" target=\"_blank\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);\r
+   fprintf(f,"<th style=\"text-align: right\">%d</th>\n\\r

 <th style=\"text-align: right\">100 %%</th>\n\\r
 <th style=\"text-align: right\">100 %%</th>\n\\r

-<th style=\"text-align: right\">%ld G</th>\n\\r
+<th style=\"text-align: right\">%ld GB</th>\n\\r

 <th style=\"text-align: right\">100 %%</th></tr>\n",i-1,total);\r
    fputs("</thead></table>\n", f);\r
   }\r
 \r
   fprintf(f, stats_html_signature, version);\r
   fclose(f);\r
 <th style=\"text-align: right\">100 %%</th></tr>\n",i-1,total);\r
    fputs("</thead></table>\n", f);\r
   }\r
 \r
   fprintf(f, stats_html_signature, version);\r
   fclose(f);\r

-  puts(" done.");\r
+  puts("done.");\r

  }\r
  else\r
  {\r
  }\r
  else\r
  {\r


@@ -1045,7 +1062,7 @@ void append_log(struct IP *self) /*using global variables*/
  string(str,STRLEN); \r
  sprintf(str,"%s/%s.log", log_dir, self->name);\r
  f=fopen(str,"a");\r
  string(str,STRLEN); \r
  sprintf(str,"%s/%s.log", log_dir, self->name);\r
  f=fopen(str,"a");\r

- if(f)\r
+ if(f > 0)\r

  {\r
   fprintf(f,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",\r
             time(NULL), self->name, self->traffic, self->direct, self->proxy,\r
  {\r
   fprintf(f,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",\r
             time(NULL), self->name, self->traffic, self->direct, self->proxy,\r


@@ -1622,27 +1639,35 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  }\r
  else if(!dry_run && !just_flush)\r
  {\r
  }\r
  else if(!dry_run && !just_flush)\r
  {\r

-  const char *previous="/var/run/prometheus.previous";\r

   /*-----------------------------------------------------------------*/\r
   /*-----------------------------------------------------------------*/\r

-  printf("Writing data transfer database %s ... ", previous);\r
+  printf("Writing daily statistics  %s ... ", json);\r

   /*-----------------------------------------------------------------*/\r
   /*-----------------------------------------------------------------*/\r

-  f=fopen(previous,"w");\r
-  if(f)\r
+  f=fopen(json, "w");\r
+  if(f > 0)\r

   {\r
   {\r

-   for_each(ip,ips)\r
+   int jsoncount=0;\r
+   fprintf(f, "{\n");\r
+   for_each(ip, ips)\r

    {\r
    {\r

-    if(ip->traffic || ip->direct || ip->proxy || ip->upload)\r
+    if(jsoncount)\r

     {\r
     {\r

-     fprintf(f,"%s %Lu %Lu %Lu %Lu\n",\r
-               ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);\r
+     fprintf(f, ",\n");\r

     }\r
     }\r

+    if(     ip->lmsid > 0 \r
+        && (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
+    }\r
+    jsoncount++;\r

    }\r
    }\r

+   fprintf(f, "}\n");\r

    fclose(f);\r
    fclose(f);\r

-   puts(" done.");\r
+   puts("done.");\r

   }\r
   else\r
   {\r
   }\r
   else\r
   {\r

-   perror(previous);\r
+   perror(json);\r

   }\r
   f=fopen(html,"w");\r
   ptr=html;\r
   }\r
   f=fopen(html,"w");\r
   ptr=html;\r


@@ -1783,7 +1808,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); \r
 #endif\r
    /* hostnames -------------------------------------- */\r
    printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); \r
 #endif\r
    /* hostnames -------------------------------------- */\r

-   fprintf(f,"%s<td style=\"text-align: right\"><a name=\"%s\"></a>%d</td><td><a class=\"blue\" href=\"%s%s.log\">%s</a>\n", \r
+   fprintf(f,"%s<td style=\"text-align: right\"><a name=\"%s\"></a>%d</td><td><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", \r

               tr_odd_even(), ip->name, i, log_url, ip->name, ip->name);\r
 \r
    if(use_jquery_popups)\r
               tr_odd_even(), ip->name, i, log_url, ip->name, ip->name);\r
 \r
    if(use_jquery_popups)\r


@@ -1792,7 +1817,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      popup_button=0;\r
      for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
      {\r
      popup_button=0;\r
      for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
      {\r

-      fprintf(f,"<br /><a class=\"blue\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);\r
+      fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);\r

       popup_button++;\r
      }\r
      fputs("</span>\n",f);\r
       popup_button++;\r
      }\r
      fputs("</span>\n",f);\r


@@ -1810,7 +1835,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     fputs("<td style=\"text-align: right\">",f);\r
     if(ip->lmsid > 0)\r
     {\r
     fputs("<td style=\"text-align: right\">",f);\r
     if(ip->lmsid > 0)\r
     {\r

-     fprintf(f,"<a class=\"blue\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);\r
+     fprintf(f,"<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);\r

     }\r
     else if(ip->lmsid == 0)\r
     {\r
     }\r
     else if(ip->lmsid == 0)\r
     {\r


@@ -1850,10 +1875,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
      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
      }\r
      fputs("</span>\n",f);\r
    }\r


@@ -1885,6 +1906,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    if(!just_preview)\r
    {\r
     append_log(ip);\r
    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
    }\r
   }\r
   fprintf(f,"</tbody><thead><tr>\n\\r


@@ -1914,7 +1939,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    if_exists(sum,sums,sum->l>=total_traffic/4)\r
    {\r
     fprintf(f,"%s<td>Top 25%% of traffic</td>\n", tr_odd_even());\r
    if_exists(sum,sums,sum->l>=total_traffic/4)\r
    {\r
     fprintf(f,"%s<td>Top 25%% of traffic</td>\n", tr_odd_even());\r

-    fprintf(f,"<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d %%</td><td style=\"text-align: right\">%Lu M</td><td style=\"text-align: right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
+              sum->i, (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);\r

    }\r
    \r
    if_exists(sum,sums,sum->i==10)\r
    }\r
    \r
    if_exists(sum,sums,sum->i==10)\r


@@ -1924,7 +1953,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 <td style=\"text-align: right\">%d %%</td>\n\\r
 <td style=\"text-align: right\">%Lu MB</td>\n\\r
 <td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
 <td style=\"text-align: right\">%d %%</td>\n\\r
 <td style=\"text-align: right\">%Lu MB</td>\n\\r
 <td style=\"text-align: right\">%Ld %%</td></tr>\n",\r

-              (100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
+              (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);\r

    }\r
 \r
    if_exists(sum,sums,sum->l>=total_traffic/2)\r
    }\r
 \r
    if_exists(sum,sums,sum->l>=total_traffic/2)\r


@@ -1991,10 +2020,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
               sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
    }\r
 \r
               sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
    }\r
 \r

-   fprintf(f,"<tr><thead><th><a class=\"blue\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);\r
+   fprintf(f,"<thead><tr><th><a class=\"blue\" target=\"_blank\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);\r

    fprintf(f,"<th style=\"text-align: right\">%d</th>\n\\r
 <th style=\"text-align: right\">100 %%</th>\n\\r
    fprintf(f,"<th style=\"text-align: right\">%d</th>\n\\r
 <th style=\"text-align: right\">100 %%</th>\n\\r

-<th style=\"text-align: right\">%Lu M</th>\n\\r
+<th style=\"text-align: right\">%Lu MB</th>\n\\r

 <th style=\"text-align: right\">100 %%</th></tr>\n",active_classes,total_traffic);\r
    fputs("</thead></table>\n", f);\r
 \r
 <th style=\"text-align: right\">100 %%</th></tr>\n",active_classes,total_traffic);\r
    fputs("</thead></table>\n", f);\r
 \r


@@ -2026,19 +2055,26 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  {\r
   puts("Statistics preview generated (-p switch) - now exiting ...");\r
   exit(0);\r
  {\r
   puts("Statistics preview generated (-p switch) - now exiting ...");\r
   exit(0);\r

- }\r
-  \r
- /*-----------------------------------------------------------------*/\r
- puts("Generating iptables and tc classes ...");\r
- /*-----------------------------------------------------------------*/\r
+ }  \r

 \r
  i=0;\r
 #ifdef DEBUG\r
  printf("%-22s %-15s mark\n","name","ip");\r
 #endif\r
 \r
 \r
  i=0;\r
 #ifdef DEBUG\r
  printf("%-22s %-15s mark\n","name","ip");\r
 #endif\r
 \r

- for_each(ip,ips) if(ip->mark>0)\r
- { \r
+ printf("Writing %s ... ", classmap); \r
+ f = fopen(classmap, "w"); \r
+ if(f < 0)\r
+ {\r
+  perror(classmap);\r
+ }\r
+\r
+ /*-----------------------------------------------------------------*/\r
+ puts("Generating iptables and tc classes ... ");\r
+ /*-----------------------------------------------------------------*/\r
+\r
+ for_each(ip, ips) if(ip->mark > 0)\r
+ {\r

   if(idxs)\r
   {\r
    char *buf;\r
   if(idxs)\r
   {\r
    char *buf;\r


@@ -2067,27 +2103,32 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 \r
   /* -------------------------------------------------------- mark download */\r
   \r
 \r
   /* -------------------------------------------------------- mark download */\r
   \r

-  sprintf(str,"-A %s -d %s/32 -o %s -j %s%d",chain_postrouting,ip->addr,lan,mark_iptables,ip->mark);\r
+  sprintf(str, "-A %s -d %s/32 -o %s -j %s%d",\r
+               chain_postrouting, ip->addr, lan, mark_iptables, ip->mark);\r

   /*sprintf(str,"-A %s -d %s/32 -o %s -j MARK --set-mark %d",chain_postrouting,ip->addr,lan,ip->mark);*/\r
   /* -m limit --limit 1/s */  \r
   save_line(str);\r
 \r
   if(qos_proxy)\r
   {\r
   /*sprintf(str,"-A %s -d %s/32 -o %s -j MARK --set-mark %d",chain_postrouting,ip->addr,lan,ip->mark);*/\r
   /* -m limit --limit 1/s */  \r
   save_line(str);\r
 \r
   if(qos_proxy)\r
   {\r

-   sprintf(str,"-A %s -s %s -p tcp --sport %d -d %s/32 -o %s -j %s%d",chain_postrouting,proxy_ip,proxy_port,ip->addr,lan,mark_iptables,ip->mark);\r
+   sprintf(str, "-A %s -s %s -p tcp --sport %d -d %s/32 -o %s -j %s%d",\r
+                chain_postrouting, proxy_ip, proxy_port, ip->addr, lan, mark_iptables, ip->mark);\r

    /*sprintf(str,"-A %s -s %s -p tcp --sport %d -d %s/32 -o %s -j MARK --set-mark %d",chain_postrouting,proxy_ip,proxy_port,ip->addr,lan,ip->mark);*/\r
    save_line(str);\r
   }\r
 \r
    /*sprintf(str,"-A %s -s %s -p tcp --sport %d -d %s/32 -o %s -j MARK --set-mark %d",chain_postrouting,proxy_ip,proxy_port,ip->addr,lan,ip->mark);*/\r
    save_line(str);\r
   }\r
 \r

-  sprintf(str,"-A %s -d %s/32 -o %s -j ACCEPT",chain_postrouting,ip->addr,lan);\r
+  sprintf(str, "-A %s -d %s/32 -o %s -j ACCEPT",\r
+               chain_postrouting, ip->addr, lan);\r

   save_line(str);\r
 \r
   /* -------------------------------------------------------- mark upload */\r
   save_line(str);\r
 \r
   /* -------------------------------------------------------- mark upload */\r

-  sprintf(str,"-A %s -s %s/32 -o %s -j %s%d",chain_forward,ip->addr,wan,mark_iptables,ip->mark);\r
+  sprintf(str, "-A %s -s %s/32 -o %s -j %s%d", \r
+               chain_forward, ip->addr, wan, mark_iptables, ip->mark);\r

   /*  sprintf(str,"-A %s -s %s/32 -o %s -j MARK --set-mark %d",chain_forward,ip->addr,wan,ip->mark);*/\r
   save_line(str);\r
 \r
   /*  sprintf(str,"-A %s -s %s/32 -o %s -j MARK --set-mark %d",chain_forward,ip->addr,wan,ip->mark);*/\r
   save_line(str);\r
 \r

-  sprintf(str,"-A %s -s %s/32 -o %s -j ACCEPT",chain_forward,ip->addr,wan);\r
+  sprintf(str, "-A %s -s %s/32 -o %s -j ACCEPT",\r
+               chain_forward, ip->addr, wan);\r

   save_line(str);\r
 \r
   if(ip->min)\r
   save_line(str);\r
 \r
   if(ip->min)\r


@@ -2097,17 +2138,21 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    printf("(down: %dk-%dk ", ip->min, ip->max); \r
 #endif\r
 \r
    printf("(down: %dk-%dk ", ip->min, ip->max); \r
 #endif\r
 \r

-   sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", tc, lan, ip->group, ip->mark,ip->min,ip->max, burst, ip->prio);\r
+   sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", \r
+                tc, lan, ip->group, ip->mark,ip->min,ip->max, burst, ip->prio);\r

    safe_run(str);\r
 \r
    if(strcmpi(ip->keyword->leaf_discipline, "none"))\r
    {\r
    safe_run(str);\r
 \r
    if(strcmpi(ip->keyword->leaf_discipline, "none"))\r
    {\r

-     sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, lan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
+     sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s", \r
+                  tc, lan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r

      safe_run(str);\r
      safe_run(str);\r

-   }   \r
+   }\r
+\r

    if(filter_type == 1)\r
    {\r
    if(filter_type == 1)\r
    {\r

-     sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, lan, ip->mark, ip->mark);\r
+     sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",\r
+                  tc, lan, ip->mark, ip->mark);\r

      safe_run(str);\r
    }\r
 \r
      safe_run(str);\r
    }\r
 \r


@@ -2125,14 +2170,22 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    \r
    if(strcmpi(ip->keyword->leaf_discipline, "none"))\r
    {\r
    \r
    if(strcmpi(ip->keyword->leaf_discipline, "none"))\r
    {\r

-     sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s",tc, wan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
+     sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s",\r
+                  tc, wan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r

      safe_run(str);\r
    }   \r
      safe_run(str);\r
    }   \r

+\r

    if(filter_type == 1)\r
    {\r
    if(filter_type == 1)\r
    {\r

-     sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",tc, wan, ip->mark, ip->mark);\r
+     sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",\r
+                  tc, wan, ip->mark, ip->mark);\r

      safe_run(str);\r
    }\r
      safe_run(str);\r
    }\r

+  \r
+   if(f)\r
+   {\r
+     fprintf(f, "%s %d\n", ip->addr, ip->mark);\r
+   }\r

   }\r
   else\r
   {\r
   }\r
   else\r
   {\r


@@ -2142,7 +2195,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   }\r
   i++;\r
  }\r
   }\r
   i++;\r
  }\r

-\r
+ if(f)\r
+ {\r
+  puts("done.");\r
+  fclose(f);\r
+ }\r
+ \r

  if(idxs)\r
  {\r
    chain_forward = "forw_common";\r
  if(idxs)\r
  {\r
    chain_forward = "forw_common";\r


@@ -2156,31 +2214,36 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  /* -------------------------------- classify or reject free download */\r
  {\r
    char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */\r
  /* -------------------------------- classify or reject free download */\r
  {\r
    char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */\r

-   if(free_min) final_chain = "ACCEPT";\r
+   if(free_min)\r
+   {\r
+    final_chain = "ACCEPT";\r
+   }\r

    if(qos_proxy)\r
    {\r
      if(free_min)\r
      {\r
    if(qos_proxy)\r
    {\r
      if(free_min)\r
      {\r

-       sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s%d",chain_postrouting,proxy_ip,proxy_port,lan,mark_iptables,3);\r
+       sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s%d",\r
+                   chain_postrouting,proxy_ip,proxy_port,lan,mark_iptables,3);\r

        save_line(str);\r
      }\r
        save_line(str);\r
      }\r

-     sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s",chain_postrouting,proxy_ip,proxy_port,lan,final_chain);\r
+     sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s",\r
+                  chain_postrouting,proxy_ip,proxy_port,lan,final_chain);\r

      save_line(str);\r
    }\r
    if(free_min)\r
    {\r
      save_line(str);\r
    }\r
    if(free_min)\r
    {\r

-     sprintf(str,"-A %s -o %s -j %s%d",chain_postrouting,lan,mark_iptables,3);\r
+     sprintf(str,"-A %s -o %s -j %s%d", chain_postrouting, lan, mark_iptables, 3);\r

      save_line(str);\r
    }\r
      save_line(str);\r
    }\r

-   sprintf(str,"-A %s -o %s -j %s",chain_postrouting,lan,final_chain);\r
+   sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);\r

    save_line(str);\r
    /* ------------------------------- classify or reject free  upload */\r
    if(free_min)\r
    {\r
    save_line(str);\r
    /* ------------------------------- classify or reject free  upload */\r
    if(free_min)\r
    {\r

-     sprintf(str,"-A %s -o %s -j %s%d",chain_forward,wan,mark_iptables,3);\r
+     sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, 3);\r

      save_line(str);\r
    }\r
      save_line(str);\r
    }\r

-   sprintf(str,"-A %s -o %s -j %s",chain_forward,wan,final_chain);\r
+   sprintf(str,"-A %s -o %s -j %s", chain_forward, wan, final_chain);\r

    save_line(str);\r
  }\r
 \r
    save_line(str);\r
  }\r
 \r


@@ -2190,25 +2253,25 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    puts("Generating free bandwith classes ...");\r
    /*-----------------------------------------------------------------*/\r
    sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
    puts("Generating free bandwith classes ...");\r
    /*-----------------------------------------------------------------*/\r
    sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d",\r

-                tc,lan,parent,free_min,free_max,burst,lowest_priority);\r
+                tc, lan, parent, free_min, free_max,burst, lowest_priority);\r

    safe_run(str);\r
    sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
    safe_run(str);\r
    sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d",\r

-                tc,wan,parent,free_min,free_max,burst,lowest_priority);\r
+                tc, wan, parent, free_min, free_max, burst, lowest_priority);\r

    safe_run(str);\r
    /* tc SFQ */\r
    if(strcmpi(qos_leaf, "none"))\r
    {\r
    safe_run(str);\r
    /* tc SFQ */\r
    if(strcmpi(qos_leaf, "none"))\r
    {\r

-     sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,lan,qos_leaf);\r
+     sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s", tc, lan, qos_leaf);\r

      safe_run(str);\r
    \r
      safe_run(str);\r
    \r

-     sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,wan,qos_leaf);\r
+     sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s", tc, wan, qos_leaf);\r

      safe_run(str);\r
    }   \r
    /* tc handle 1 fw flowid */\r
      safe_run(str);\r
    }   \r
    /* tc handle 1 fw flowid */\r

-   sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,lan);\r
+   sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3", tc, lan);\r

    safe_run(str);\r
 \r
    safe_run(str);\r
 \r

-   sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,wan);\r
+   sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3", tc, wan);\r

    safe_run(str);\r
  }\r
  printf("Total IP count: %d\n", i);\r
    safe_run(str);\r
  }\r
  printf("Total IP count: %d\n", i);\r