json bug fix :-)
[svn/Prometheus-QoS/.git] / prometheus.c
index 3657448..8c70bb0 100644 (file)
@@ -7,7 +7,7 @@
 /*  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
 \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
-const char *stats_html_signature = "<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></small>\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
-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
@@ -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
-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            *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
@@ -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
+\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-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
@@ -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
+  option("json-filename",json);\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
@@ -474,7 +479,7 @@ void get_config(char *config_filename)
  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
@@ -605,7 +610,7 @@ void get_traffic_statistics(void)
      {\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
@@ -651,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
@@ -684,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
@@ -895,11 +899,16 @@ void parse_ip_log(int argc, char **argv)
   }\r
  }\r
  sprintf(str,"%s/%s-%s.html",html_log_dir,year,month);\r
- printf("Writing %s ...",str);\r
+ printf("Writing %s ... ",str);\r
  f=fopen(str,"w");\r
- if(f)\r
+ if(f > 0)\r
  {\r
-  fprintf(f, "<table border=\"1\"><thead><tr class=\"bgGrey\"><th colspan=\"2\">%s %s</th><th align=\"right\">lms</th><th colspan=\"2\">Data transfers</th><th align=\"right\">Min.speed</th></tr></thead><tbody>\n ",\r
+  fprintf(f, "<table class=\"decorated last\"><thead>\n\\r
+<tr><th colspan=\"2\">%s %s</th>\n\\r
+<th style=\"text-align: right\">lms</th>\n\\r
+<th colspan=\"2\">Data transfers</th>\n\\r
+<th style=\"text-align: right\">Min.speed</th>\n\\r
+</tr></thead><tbody>\n ",\r
              month, year);\r
 \r
   row_odd_even = 0;\r
@@ -907,93 +916,166 @@ void parse_ip_log(int argc, char **argv)
   {\r
    if(iplog->traffic)\r
    {\r
-    fprintf(f, "%s<td align=\"right\">%d</td><td align=\"left\"><a href=\"%s%s.log\">%s</td></td><td align=\"right\">", \r
+    fprintf(f, "%s<td style=\"text-align: right\">%d</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
-     fprintf(f, "<a 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
      fputs("-------",f);\r
     }    \r
-    fprintf(f, "<td align=\"right\">%ld&nbsp;M</td><th align=\"right\">%ld G</th><td align=\"right\">%ld kbps</th></tr>\n",\r
+    fprintf(f, "<td style=\"text-align: right\">%ld&nbsp;MB</td>\n\\r
+    <td style=\"text-align: right\"><strong>%ld&nbsp;GB</strong></td>\n\\r
+    <td style=\"text-align: right\">%ld&nbsp;kb/s</th></tr>\n",\r
                iplog->traffic, iplog->traffic>>10, iplog->guaranted);\r
     total+=iplog->traffic>>10;\r
     iplog->i=i;\r
     iplog->l=total;\r
    }\r
   }\r
-  fprintf(f,"<tr class=\"bgGrey\"><th colspan=\"4\" align=\"left\">Total:</th><th align=\"right\">%ld GB</th><th align=\"right\">%Ld kbps</th></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
-   fputs("<a name=\"erp\"></a><p><table border=\"0\"><thead><caption>Enterprise Resource Planning (ERP)</caption></tr>\n",f);\r
-   fputs("<tr class=\"bgGrey\"><td>Analytic category</td>\n",f);\r
-   fputs("<td colspan=\"2\" align=\"center\">Active Classes</td><td colspan=\"2\" align=\"center\">Data transfers</td></tr>\n</thead><tbody>\n",f);\r
+   fputs("<a name=\"erp\"></a><p><table class=\"decorated last\">\n\\r
+<caption>Enterprise Resource Planning (ERP)</caption>\n\\r
+<thead><tr>\n\\r
+<th>Analytic category</th>\n\\r
+<th colspan=\"2\" style=\"text-align: center\">Active Classes</th>\n\\r
+<th colspan=\"2\" style=\"text-align: center\">Data transfers</th>\n\\r
+</tr></thead><tbody>\n",f);\r
 \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 align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><td 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
     fprintf(f,"%s<td>Top 10 downloaders</td>\n", tr_odd_even());\r
-    fprintf(f,"<th align=\"right\">10</th><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><td align=\"right\">%d %%</td></tr>\n",(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\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 GB</td>\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
    }\r
 \r
    if_exists(iplog,iplogs,iplog->l>=total/2)\r
    {\r
     fprintf(f,"%s<td>Top 50%% of traffic</td>\n", tr_odd_even());\r
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><th align=\"right\">%d %%</th></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\"><strong>%d %%</strong></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->l>=4*total/5)\r
    {\r
     fprintf(f,"%s<td>Top 80%% of traffic</td>\n",tr_odd_even());\r
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><th align=\"right\">%d %%</th></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\"><strong>%d %%</strong></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/5)\r
    {\r
     fprintf(f,"%s<td>Top 20%% downloaders</td>\n",tr_odd_even());\r
-    fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%ld G</td><td 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\"><strong>%d %%</strong></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/4)\r
    {\r
     fprintf(f,"%s<td>Top 25%% downloaders</td>\n", tr_odd_even());\r
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><td 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
     fprintf(f,"%s<td>Top 50%% downloaders</td>\n",tr_odd_even());\r
-    fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%ld G</td><td 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\"><strong>%d %%</strong></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>=4*i/5)\r
    {\r
     fprintf(f,"%s<td>Top 80%% downloaders</td>\n",tr_odd_even());\r
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><td 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
-   fprintf(f,"<tr class=\"bgGrey\"><td>All users, all traffic</td>\n");\r
-   fprintf(f,"<th align=\"right\">%d</th><th align=\"right\">100 %%</th><th align=\"right\">%ld G</th><th align=\"right\">100 %%</th></tr>\n",i-1,total);\r
-   fputs("</tbody></table>\n", f);\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\">%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
-  puts(" done.");\r
+  puts("done.");\r
+ }\r
+ else\r
+ {\r
+  perror(str);\r
+ }\r
+}\r
+\r
+void append_log(struct IP *self) /*using global variables*/\r
+{\r
+ char *d, *str;\r
+ FILE *f; \r
+\r
+ date(d); /* this is typical cll1.h macro - prints current date */ \r
+ string(str,STRLEN); \r
+ sprintf(str,"%s/%s.log", log_dir, self->name);\r
+ f=fopen(str,"a");\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
+            self->upload, self->min, self->max, self->desired, self->lmsid, d); /* d = date*/\r
+  fclose(f);\r
+ }\r
+ else\r
+ {\r
+  perror(str);\r
  }\r
 }\r
 \r
+\r
 /*-----------------------------------------------------------------*/\r
 /* Are you looking for int main(int argc, char **argv) ? :-))      */\r
 /*-----------------------------------------------------------------*/\r
@@ -1133,7 +1215,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     ip->min = atoi(substring);\r
     if(ip->min <= 0)\r
     {\r
-     printf(" %s: Illegal value of minimum bandwidth 0 kbps, using %d kbps\n",\r
+     printf(" %s: Illegal value of minimum bandwidth 0 kbps, using %d kb/s\n",\r
             str, free_min);\r
      ip->min = free_min;\r
     }\r
@@ -1410,7 +1492,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  if(just_flush)\r
  {\r
   fclose(iptables_file);\r
-  if(log_file) fclose(log_file);\r
+  if(log_file)\r
+  { \r
+   fclose(log_file);\r
+  }\r
   puts("Just flushed iptables and tc classes - now exiting ...");\r
   exit(0);\r
  }\r
@@ -1555,22 +1640,35 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  else if(!dry_run && !just_flush)\r
  {\r
   /*-----------------------------------------------------------------*/\r
-  printf("Writing data transfer database ...\n");\r
+  printf("Writing daily statistics  %s ... ", json);\r
   /*-----------------------------------------------------------------*/\r
-  f=fopen("/var/run/prometheus.previous","w");\r
-  if(f)\r
+  f=fopen(json, "w");\r
+  if(f > 0)\r
   {\r
-   for_each(ip,ips)\r
+   int jsoncount=0;\r
+   fprintf(f, "{\n");\r
+   for_each(ip, ips)\r
    {\r
-    if(ip->traffic || ip->direct || ip->proxy || ip->upload)\r
+    if(jsoncount)\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
+    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
+   fprintf(f, "}\n");\r
    fclose(f);\r
+   puts("done.");\r
+  }\r
+  else\r
+  {\r
+   perror(json);\r
   }\r
-\r
   f=fopen(html,"w");\r
   ptr=html;\r
  }\r
@@ -1588,7 +1686,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   {\r
    fprintf(f,"<script type=\"text/javascript\" src=\"%s\"></script>\n", jquery_url);\r
   }\r
-  fputs("<table border=\"0\">\n<thead><tr class=\"bgGrey\"><th align=\"right\">#</th><th align=\"right\">group</th><th align=\"right\">IPs</th><th align=\"right\">requested</th>\n",f);\r
+  fputs("<table class=\"decorated last\">\n\\r
+<caption>Bandwidth classes</caption>\n\\r
+<thead><tr>\n\\r
+<th style=\"text-align: right\">#</th>\n\\r
+<th style=\"text-align: right\">group</th>\n\\r
+<th style=\"text-align: right\">IPs</th>\n\\r
+<th style=\"text-align: right\">requested</th>\n",f);\r
   fprintf(f,"<th colspan=\"%d\">data limits</th>\n", keywordcount);\r
   fputs("</tr></thead><tbody>\n",f);\r
 \r
@@ -1596,16 +1700,16 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   for_each(group, groups) \r
   { \r
 #ifdef DEBUG\r
-   printf("%d k group: %d bandwidth requested: %d k\n",group->min,group->count,group->desired);\r
+   printf("%d kb/s group: %d bandwidth requested: %d kb/s\n",group->min,group->count,group->desired);\r
 #endif\r
-   fprintf(f, "%s<td align=\"right\">%d</td><td align=\"right\">%d&nbsp;k</td>",\r
+   fprintf(f, "%s<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d&nbsp;kb/s</td>",\r
               tr_odd_even(), count, group->min);\r
-   fprintf(f, "<td align=\"right\">%d</td><td align=\"right\">%d&nbsp;k</td>",\r
+   fprintf(f, "<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d&nbsp;kb/s</td>",\r
               group->count, group->desired);\r
 \r
-   for_each(keyword, keywords)\r
+   for_each(keyword, keywords) if(keyword->ip_count)\r
    {\r
-    fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%d&nbsp;M</span></td>",\r
+    fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%d&nbsp;MB</span></td>",\r
               keyword->html_color, group->min*keyword->data_limit);\r
    }   \r
    i += group->desired; \r
@@ -1613,20 +1717,22 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    count++; \r
   }\r
 #ifdef DEBUG\r
-   printf("Total groups: %d Total bandwidth requested: %d k\nAGGREGATION: 1/%d\n",\r
+   printf("Total groups: %d Total bandwidth requested: %d kb/s\nAGGREGATION: 1/%d\n",\r
           count, i, i/line);\r
 #endif\r
-   fprintf(f,"<tr class=\"bgGrey\"><th colspan=\"2\" align=\"left\">Line %Ld k</td>",line);\r
-   fprintf(f,"<th align=\"right\">%d</td><th align=\"right\">%d k</td>",total,i);\r
+   fprintf(f,"</tr></tbody>\n\\r
+<thead><tr>\n\\r
+<th colspan=\"2\" style=\"text-align: left\">Line %Ld kb/s</td>",line);\r
+   fprintf(f,"<th style=\"text-align: right\">%d</td><th style=\"text-align: right\">%d kb/s</td>",total,i);\r
 \r
-   for_each(keyword, keywords)\r
+   for_each(keyword, keywords) if(keyword->ip_count)\r
    {\r
-    fprintf(f,"<th align=\"right\">%d IPs</th>",keyword->ip_count);\r
+    fprintf(f,"<th style=\"text-align: right\">%d IPs</th>",keyword->ip_count);\r
    }\r
    fprintf(f,"</tr><tr><th colspan=\"4\">Aggregation 1/%d</th>\n", (int)(0.5+i/line));\r
    fprintf(f,"<th colspan=\"%d\">%d traffic classes</th></tr>\n", keywordcount, total);\r
 \r
-   fputs("</tbody></table>\n",f);\r
+   fputs("</thead></table>\n",f);\r
  }\r
  else if(!dry_run && !just_flush)\r
  {\r
@@ -1638,8 +1744,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  {\r
   unsigned long long total_traffic=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;\r
   int active_classes=0;\r
-  int colspan=11;\r
-  FILE *iplog;\r
+  int colspan=12;\r
   struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums=NULL;\r
   int limit_count=0, prio_count=0;\r
   int popup_button=0;\r
@@ -1648,32 +1753,37 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   {\r
    colspan++;\r
   }\r
-  if(found_lmsid)\r
-  {\r
-   colspan++;\r
-  }\r
   \r
-  fprintf(f,"<p><table border>\n<thead><caption>%s",title);\r
+  fprintf(f,"<p><table class=\"decorated last\">\n<caption>%s",title);\r
   fprintf(f," (%s)</caption>\n", d);\r
-  fputs("<tr class=\"bgGrey\"><td align=\"right\">#</td><td>hostname</td>",f);\r
-  if(found_lmsid)\r
-  {\r
-   fputs("<td align=\"right\">lms</td>\n",f);\r
-  }\r
-  fputs("<td align=\"right\">credit</td>\\r
-<td align=\"right\">limit</td>\\r
-<td align=\"right\">total</td>\\r
-<td align=\"right\">direct</td>\n",f);\r
+  fputs("<thead><tr>\n<th colspan=\"3\">&nbsp;</th>\n",f);\r
+  fputs("<th style=\"text-align: right\">credit</th>\n\\r
+<th style=\"text-align: right\">FUP</th>\n\\r
+<th style=\"text-align: right\">total</th>\n\\r
+<th style=\"text-align: right\">down</th>\n",f);\r
   if(qos_proxy)\r
   {\r
-   fputs("<td align=\"right\">proxy</td>\n",f);\r
+   fputs("<th style=\"text-align: right\">proxy</th>\n",f);\r
   }\r
-  fputs("<td align=\"right\">upload</td>\\r
-<td align=\"right\">minimum</td>\\r
-<td align=\"right\">desired</td>\\r
-<td align=\"right\">maximum</td>\\r
-<td>prio</td></tr>\n\\r
-</thead><tbody>\n",f); \r
+  fputs("<th style=\"text-align: right\">up</th>\n\\r
+<th style=\"text-align: right\">min</th>\n\\r
+<th style=\"text-align: right\">max</th>\n\\r
+<th style=\"text-align: right\">limit</th>\n\\r
+<th>&nbsp;</th>\n\\r
+</tr><tr>\n\\r
+<th style=\"text-align: right\">#</th>\n\\r
+<th>hostname [+sharing]</th>\n\\r
+<th style=\"text-align: right\">LMS</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">kb/s</th>\n\\r
+<th style=\"text-align: right\">kb/s</th>\n\\r
+<th style=\"text-align: right\">kb/s</th>\n\\r
+<th>prio</th>\n\\r
+</tr></thead><tbody>\n",f);    \r
 \r
   row_odd_even = 0;\r
   for_each(ip,ips) if(!use_jquery_popups || !ip->sharing)\r
@@ -1698,21 +1808,22 @@ 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
-   fprintf(f,"%s<td align=\"right\"><a name=\"%s\"></a>%d</td><td><a 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
    {\r
      fprintf(f,"<span id=\"sharing_%d\" style=\"display:none\">",i);\r
      popup_button=0;\r
      for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
      {\r
-      fprintf(f,"<br /><a 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
      if(popup_button)\r
      {\r
-      fprintf(f,"<span>[<a href=\"#\" onClick=\"$(this).parent().hide();$(\'#sharing_%d\').show();$(\'#download_%d\').show();$(\'#upload_%d\').show();return(false);\" style=\"cursor: pointer;\">+%d</a>]</span>",\r
+      fprintf(f,"<span>[<a class=\"blue\" href=\"#\" onClick=\"$(this).parent().hide();$(\'#sharing_%d\').show();$(\'#download_%d\').show();$(\'#upload_%d\').show();return(false);\" style=\"cursor: pointer;\">+%d</a>]</span>",\r
                 i, i, i, popup_button);\r
      }\r
    }\r
@@ -1721,11 +1832,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 \r
    if(found_lmsid)\r
    {\r
-    fputs("<td align=\"right\">",f);\r
+    fputs("<td style=\"text-align: right\">",f);\r
     if(ip->lmsid > 0)\r
     {\r
-     /*base URL will be configurable soon ... */\r
-     fprintf(f,"<a 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
@@ -1733,20 +1843,20 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     }\r
     fputs("</td>\n",f);\r
    }\r
-   fprintf(f,"<td align=\"right\">%Lu&nbsp;M</td>\n", ip->credit);\r
-   fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%Lu&nbsp;M</span></td>",\r
+   fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->credit);\r
+   fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%Lu</span></td>",\r
              ip->keyword->html_color,\r
              ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));\r
-   fprintf(f,"<td align=\"right\">%s%Lu&nbsp;M%s", f1, ip->traffic, f2);\r
+   fprintf(f,"<td style=\"text-align: right\">%s%Lu%s", f1, ip->traffic, f2);\r
 \r
    /* download --------------------------------------- */\r
-   fprintf(f,"</td><td align=\"right\">%Lu&nbsp;M", ip->direct);\r
+   fprintf(f,"</td><td style=\"text-align: right\">%Lu", ip->direct);\r
    if(use_jquery_popups)\r
    {\r
      fprintf(f,"<span id=\"download_%d\" style=\"display:none\">",i);\r
      for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
      {\r
-      fprintf(f,"<br />%Lu&nbsp;M", sharedip->direct);\r
+      fprintf(f,"<br />%Lu", sharedip->direct);\r
      }\r
      fputs("</span>\n",f);\r
    }\r
@@ -1755,24 +1865,29 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 \r
    if(qos_proxy)\r
    {\r
-    fprintf(f,"<td align=\"right\">%Lu&nbsp;M</td>\n", ip->proxy);\r
+    fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->proxy);\r
    }\r
    /* upload ---------------------------------------- */\r
-   fprintf(f,"<td align=\"right\">%Lu&nbsp;M", ip->upload);\r
+   fprintf(f,"<td style=\"text-align: right\">%Lu", ip->upload);\r
    if(use_jquery_popups)\r
    {\r
      fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">",i);\r
      for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
      {\r
-      fprintf(f,"<br />%Lu&nbsp;M", sharedip->upload);\r
+      fprintf(f,"<br />%Lu", sharedip->upload);\r
      }\r
      fputs("</span>\n",f);\r
    }\r
    fputs("</td>\n",f);\r
    /* ----------------------------------------------- */\r
 \r
-   fprintf(f,"<td align=\"right\">%d&nbsp;k</td><td align=\"right\">%d&nbsp;k</td><td align=\"right\">%s%d&nbsp;k%s</td><td>%s%d%s</td></tr>\n",\r
-             ip->min,ip->desired,f1,ip->max,f2,f1,ip->prio,f2);\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\">%s%d%s</td>\n\\r
+<td>%s%d%s</td></tr>\n",\r
+             ip->min, ip->desired, \r
+             f1, ip->max, f2, \r
+             f1, ip->prio, f2);\r
 \r
    total_traffic+=ip->traffic;\r
    total_direct+=ip->direct;\r
@@ -1790,25 +1905,22 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 \r
    if(!just_preview)\r
    {\r
-    sprintf(str,"%s/%s.log",log_dir,ip->name);\r
-    iplog=fopen(str,"a");\r
-    if(iplog)\r
+    append_log(ip);\r
+    for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
     {\r
-     fprintf(iplog,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",\r
-                    time(NULL), ip->name, ip->traffic, ip->direct, ip->proxy,\r
-                    ip->upload, ip->min, ip->max, ip->desired, ip->lmsid, d); /* d = date*/\r
-     fclose(iplog);\r
+     append_log(sharedip);\r
     }\r
    }\r
   }\r
-  fprintf(f,"<tr class=\"bgGrey\"><th colspan=\"%d\" align=\"left\">%d CLASSES</th>", colspan-7, i);\r
-  fprintf(f,"<th align=\"right\">%Lu&nbsp;M</th><th align=\"right\">%Lu&nbsp;M</th>\n", total_traffic, total_direct);\r
+  fprintf(f,"</tbody><thead><tr>\n\\r
+<th colspan=\"%d\" style=\"text-align: left\">%d CLASSES</th>", colspan-7, i);\r
+  fprintf(f,"<th style=\"text-align: right\">%Lu</th><th style=\"text-align: right\">%Lu</th>\n", total_traffic, total_direct);\r
   if(qos_proxy)\r
   {\r
-   fprintf(f,"<th align=\"right\">%Lu&nbsp;M</th>\n", total_proxy);\r
+   fprintf(f,"<th style=\"text-align: right\">%Lu</th>\n", total_proxy);\r
   }\r
-  fprintf(f,"<th align=\"right\">%Lu&nbsp;M</th>", total_upload);\r
-  fprintf(f,"<th colspan=\"4\"><span style=\"color:red\">FUP-LIMIT %dx</span> <span style=\"color:brown\">LOW-PRIO %dx</span></th></tr>\n</tbody></table>\n",limit_count,prio_count);\r
+  fprintf(f,"<th style=\"text-align: right\">%Lu</th>", total_upload);\r
+  fprintf(f,"<th colspan=\"4\"><span style=\"color:red\">LIMIT %dx</span> <span style=\"color:brown\">LOW-PRIO %dx</span></th></tr>\n</thead></table>\n",limit_count,prio_count);\r
 \r
   row_odd_even = 0;\r
   if(active_classes>10)\r
@@ -1817,32 +1929,51 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    long long top20_perc2=0;\r
    unsigned long long top20_sum=0l;\r
   \r
-   fputs("<a name=\"erp\"></a><p><table border><thead><caption>Enterprise Resource Planning (ERP)</caption>\n",f);\r
-   fputs("<tr class=\"bgGrey\"><td>Analytic category</td>\n",f);\r
-   fputs("<td colspan=\"2\" align=\"center\">Active Classes</td><td colspan=\"2\" align=\"center\">Data transfers</td></tr></thead><tbody>\n",f);\r
+   fputs("<a name=\"erp\"></a><p><table class=\"decorated last\"><caption>Enterprise Resource Planning (ERP)</caption>\n",f);\r
+   fputs("<thead><tr>\n\\r
+<th>Analytic category</th>\n\\r
+<th colspan=\"2\" style=\"text-align: center\">Active Classes</th>\n\\r
+<th colspan=\"2\" style=\"text-align: center\">Data transfers</th>\n\\r
+</tr></thead><tbody>\n",f);\r
 \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 align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td 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
     fprintf(f,"%s<td>Top 10 downloaders</td>\n", tr_odd_even());\r
-    fprintf(f,"<th align=\"right\">10</th><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\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\">%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
    }\r
 \r
    if_exists(sum,sums,sum->l>=total_traffic/2)\r
    {\r
     fprintf(f,"%s<td>Top 50%% of traffic</td>\n", tr_odd_even());\r
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><th align=\"right\">%Ld %%</th></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\"><strong>%Ld %%</strong></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->l>=4*total_traffic/5)\r
    {\r
     fprintf(f,"%s<td>Top 80%% of traffic</td>\n", tr_odd_even());\r
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><th align=\"right\">%Ld %%</th></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\"><strong>%Ld %%</strong></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>=(active_classes+1)/5)\r
@@ -1852,34 +1983,54 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     top20_perc1=(100*sum->i+50)/active_classes;\r
     top20_sum=sum->l;\r
     top20_perc2=(100*sum->l+50)/total_traffic;\r
-    fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",top20_count,top20_perc1,top20_sum,top20_perc2);\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\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
+              top20_count,top20_perc1,top20_sum,top20_perc2);\r
    }\r
 \r
    if_exists(sum,sums,sum->i>=(active_classes+1)/4)\r
    {\r
     fprintf(f,"%s<td>Top 25%% downloaders</td>\n", tr_odd_even());\r
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td 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>=(active_classes+1)/2)\r
    {\r
     fprintf(f,"%s<td>Top 50%% downloaders</td>\n", tr_odd_even());\r
-    fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%Lu M</td><td 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\"><strong>%d %%</strong></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>=4*(active_classes+1)/5)\r
    {\r
     fprintf(f,"%s<td>Top 80%% downloaders</td>\n", tr_odd_even());\r
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td 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></tbody>\n",\r
+              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
    }\r
 \r
-   fprintf(f,"<tr class=\"bgGrey\"><td><a href=\"%sERP.log\">All users, all traffic</a></td>\n", log_url);\r
-   fprintf(f,"<th align=\"right\">%d</th><th align=\"right\">100 %%</th><th align=\"right\">%Lu M</th><th align=\"right\">100 %%</th></tr>\n",active_classes,total_traffic);\r
-   fputs("</tbody></table>\n", f);\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
+<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
    /* write basic ERP data to log directory */\r
    if(!just_preview)\r
    {\r
+    FILE *iplog;\r
     sprintf(str,"%s/ERP.log",log_dir);\r
     iplog=fopen(str,"a");\r
     if(iplog)\r
@@ -1889,6 +2040,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
                    active_classes, total_traffic, i, limit_count, prio_count, d); /* d = date*/\r
      fclose(iplog);\r
     }\r
+    else\r
+    {\r
+     perror(str);\r
+    }\r
    }\r
   }\r
 \r
@@ -1900,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
-  \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
- 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
@@ -1941,27 +2103,32 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 \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 -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 -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
-  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 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
@@ -1971,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
-   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
-     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
-   }   \r
+   }\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
@@ -1999,14 +2170,22 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    \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
+\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
+  \r
+   if(f)\r
+   {\r
+     fprintf(f, "%s %d\n", ip->addr, ip->mark);\r
+   }\r
   }\r
   else\r
   {\r
@@ -2016,7 +2195,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   }\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
@@ -2030,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
-   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
-       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
-     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
-     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
-   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
-     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
-   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
@@ -2064,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
-                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
-                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
-     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
-     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
-   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
-   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
This page took 0.575696 seconds and 4 git commands to generate.