X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=8c70bb0b86e7340f2feff6f13b3a1c47302fc75e;hp=6d8e04917dd03aa7a25ece9797a7b2795de96843;hb=1f13bb8e59cd4f0c1a7bdfcde5599e5c0188d6c2;hpb=8bcc3268a0cc33db425eabc6eef142fe73a82b5b

diff --git a/prometheus.c b/prometheus.c
index 6d8e049..8c70bb0 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,7 +7,7 @@
 /*  Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
 
-/* Modified by: xChaos, 20111130
+/* Modified by: xChaos, 20120516
                  ludva, 20080415
  
    Prometheus QoS is free software; you can redistribute it and/or
@@ -33,21 +33,21 @@
 
 #include "cll1-0.6.2.h"
 
-const char *version = "0.8.3-b";
+const char *version = "0.8.3-d";
 
 /* Version numbers: 0.8.3 is development releases ("beta"), 0.8.4 will be "stable" */
 /* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */
 /* C source code development versions ("beta"): 0.7.9-a, 0.8.1-b, etc. */
 /* C source code release versions: 0.8.0, 0.8.2, 0.8.4, etc. */
 
-const char *stats_html_signature = "<small>Statistics generated by Prometheus QoS version %s<br>GPL+Copyright(C)2005-2011 Michael Polak, <a href=\"http://www.arachne.cz/\">Arachne Labs</a></small>\n";
+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";
 
 /* ======= All path names are defined here (for RPM patch) =======  */
 
-char              *tc = "/sbin/tc"; /* requires tc with HTB support */
-char        *iptables = "/sbin/iptables"; /* requires iptables utility */
-char    *iptablessave = "/sbin/iptables-save"; /* not yet required */
-char *iptablesrestore = "/sbin/iptables-restore";  /* requires iptables-restore */
+const char        *tc = "/sbin/tc"; /* requires tc with HTB support */
+const char  *iptables = "/sbin/iptables"; /* requires iptables utility */
+const char *iptablessave = "/sbin/iptables-save"; /* not yet required */
+const char *iptablesrestore = "/sbin/iptables-restore";  /* requires iptables-restore */
 const char        *ls = "/bin/ls"; /* this is not user configurable :-) */
 
 char          *config = "/etc/prometheus/prometheus.conf"; /* main configuration file */
@@ -55,8 +55,10 @@ char           *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition
 
 char    *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/
 char          *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */
-char            *html = "/var/www/traffic.html"; /* hall of fame filename */
+char        *classmap = "/var/lib/misc/prometheus.classes"; /* credit log file */
+char            *html = "/var/www/traffic.html"; /* hall of fame - html version */
 char         *preview = "/var/www/preview.html"; /* hall of fame preview */
+char            *json = "/var/www/traffic.json"; /* hall of fame - json version */
 char          *cmdlog = "/var/log/prometheuslog"; /* command log filename */
 char         *log_dir = "/var/www/logs/"; /* log directory pathname, ended with slash */
 char         *log_url = "/logs/"; /* log directory relative URI prefix (partial URL) */
@@ -65,6 +67,21 @@ char    *html_log_dir = "/var/www/logs/html/";
 char      *jquery_url = "http://code.jquery.com/jquery-latest.js";
 char         *lms_url = "/lms/?m=customerinfo&amp;id=";
 int use_jquery_popups = 1;
+int      row_odd_even = 0; /*<tr class="odd/even"> */
+
+
+const char *tr_odd_even(void)
+{
+ row_odd_even = 1 - row_odd_even;
+ if(row_odd_even)
+ {
+  return "<tr class=\"even\">\n";
+ }
+ else
+ {
+  return "<tr class=\"odd\">\n";
+ }
+}
 
 /* ======= Help screen is hopefuly self-documenting part of code :-) ======= */
 
@@ -238,7 +255,7 @@ void TheIP(void)
 char *very_ugly_ipv4_code(char *inip,int bitmask,int format_as_chainname)
 {
  /* warning: this function was debugged only for bitmask values 20,24,28 !!!*/
- int dot=0,n;
+ int dot=0, n;
  char *ip,*outip,*outptr,*fmt;
 
  duplicate(inip,ip);
@@ -273,23 +290,39 @@ char *very_ugly_ipv4_code(char *inip,int bitmask,int format_as_chainname)
    }
    else
    {
-    char *cutdot=strchr(ip+1,'.'); /*for bitmask<24*/
-    if(cutdot)*cutdot='\0';
+    char *cutdot=strchr(ip+1,'.'); /*for bitmask<24*/    
+    if(cutdot)
+    {
+     *cutdot = '\0';
+    }
+    
     if(format_as_chainname)
-     fmt="_%d_%d";
+    {
+     fmt = "_%d_%d";
+    }
     else
-     fmt=".%d";
+    {
+     fmt = ".%d";
+    }
+    
     if(bitmask%8)
-     n=atoi(ip+1)-atoi(ip+1)%(1<<(8-bitmask%8));
+    {
+     n = atoi(ip+1)-atoi(ip+1)%(1<<(8-bitmask%8));
+    }
     else
-     n=0;
+    {
+     n = 0;
+    }
 
     /*debug  printf("%d/%d => [_%d_%d]\n",atoi(ip+1),bitmask,n,bitmask); */
     sprintf(outptr,fmt,n,bitmask);
-    if(!format_as_chainname) while(bitmask<24)
+    if(!format_as_chainname)
     {
-     strcat(outip,".0");
-     bitmask+=8;
+     while(bitmask<24)
+     {
+      strcat(outip,".0");
+      bitmask+=8;
+     }
     }
     /* debug printf("[%s]\n",outip); */
     return outip;
@@ -394,7 +427,7 @@ void get_config(char *config_filename)
   option("iptables",iptables);
   option("iptables-save",iptablessave); /* new */
   option("iptables-restore",iptablesrestore); /* new */
-  option("iptables-file",iptablesfile); /* new */
+  option("iptables-in-filename",iptablesfile); /* new */
   option("hosts",hosts);
   option("lan-interface",lan);
   option("wan-interface",wan);
@@ -405,9 +438,11 @@ void get_config(char *config_filename)
   ioption("hall-of-fame-enable",hall_of_fame);
   option("hall-of-fame-title",title);
   option("hall-of-fame-filename",html);
+  option("json-filename",json);
   option("hall-of-fame-preview",preview);
   option("log-filename",cmdlog);
   option("credit-filename",credit);
+  option("classmap-filename",classmap);
   ioption("credit-enable",enable_credit);
   option("log-traffic-directory",log_dir);
   option("log-traffic-html-directory",html_log_dir);
@@ -430,8 +465,7 @@ void get_config(char *config_filename)
   ioption("htb-r2q",htb_r2q);
   ioption("magic-include-upload",include_upload);
   ioption("magic-treshold",magic_treshold);  
-  option("filter-type", cnf);
-  
+  option("filter-type", cnf);  
 /* not yet implemented:
   ioption("magic-fixed-packets",fixed_packets);
   ioption("magic-relative-packets",packet_limit);
@@ -445,16 +479,16 @@ void get_config(char *config_filename)
  done;
  printf("\n");
  
- /*leaf discipline for keywords*/
+ /* leaf discipline for keywords */
  for_each(keyword,keywords)
  {
-    if (!strcmpi(keyword->leaf_discipline, ""))
+    if(!strcmpi(keyword->leaf_discipline, ""))
     {
         keyword->leaf_discipline = qos_leaf;
     }
  }
 
- if (strcmpi(cnf, "mark"))
+ if(strcmpi(cnf, "mark"))
  {
   filter_type = 2;
   mark = "CLASSIFY";
@@ -508,37 +542,61 @@ void get_traffic_statistics(void)
   if(valid) switch(col)
   { 
    case 1: if(eq(ptr,"Chain"))
+           {
             setchainname=1;
+           }
            else if(eq(ptr,"pkts")) 
+           {
             valid=0;
+           }
            else
+           {
             sscanf(ptr,"%lu",&pkts); 
+           }
            break;
    case 2: if(setchainname)
            {
             if(!strncmp(ptr,"post_",5) || eq(ptr,"POSTROUTING"))
-             downloadflag=1;            
+            {
+             downloadflag = 1;            
+            }
             else 
-            if(!strncmp(ptr,"forw_",5) || eq(ptr,"FORWARD"))
-             downloadflag=0;
-            
+            {
+             if(!strncmp(ptr,"forw_",5) || eq(ptr,"FORWARD"))
+             {
+              downloadflag = 0;
+             }
+            }            
             if(eq(ptr,"post_common") || eq(ptr,"forw_common"))
-             commonflag=1;
+            {
+             commonflag = 1;
+            }
            }
            else
-            sscanf(ptr,"%Lu",&traffic); traffic+=(1<<19); traffic>>=20;
+           {
+            sscanf(ptr,"%Lu",&traffic); 
+            traffic += (1<<19);
+            traffic >>= 20;
+           }
            break;
    case 3: if((strncmp(ptr,"post_",5) && strncmp(ptr,"forw_",5)) || commonflag)
+           {
             accept=eq(ptr,mark);
-            /*if (filter_type==1) accept=eq(ptr,"MARK"); else accept=eq(ptr,"CLASSIFY");*/
+           }
+            /*if(filter_type==1) accept=eq(ptr,"MARK"); else accept=eq(ptr,"CLASSIFY");*/
            break;
    case 8: if(downloadflag)
            { 
-            if(strstr(proxy_ip,ptr))proxyflag=1; 
+            if(strstr(proxy_ip,ptr))
+            {
+             proxyflag=1; 
+            }
            }
            else
+           {
             ipaddr=ptr; 
-            break;
+           }
+           break;
    case 9: if(downloadflag)ipaddr=ptr;break;
   }
   
@@ -552,7 +610,7 @@ void get_traffic_statistics(void)
      {
       printf("(upload) ");
      }
-     printf("IP %s: %Lu M (%ld pkts)\n", ipaddr, traffic, pkts);
+     printf("IP %s: %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts);
 
      if_exists(ip,ips,eq(ip->addr,ipaddr)); 
      else 
@@ -598,8 +656,7 @@ void get_traffic_statistics(void)
      }
     }  
   }
-
- free(cmd);
+  free(cmd);
 }
  
 /* ========== This function executes, logs OR ALSO prints command ========== */
@@ -631,7 +688,7 @@ void run_restore(void)
  string(restor,STRLEN);
 
  /*-----------------------------------------------------------------*/
- printf("Running %s <%s ...\n",iptablesrestore,iptablesfile);
+ printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);
  /*-----------------------------------------------------------------*/
  
  save_line("COMMIT");
@@ -802,7 +859,7 @@ void parse_ip_log(int argc, char **argv)
       case 8:
       case 9:
       case 10:
-      case 11: if (isalpha(*ptr)) /* character, not numeric string = date, just one*/
+      case 11: if(isalpha(*ptr)) /* character, not numeric string = date, just one*/
                {
                 valid_columns(ptr2,ptr,' ',col2) switch(col2)
                 {
@@ -842,103 +899,183 @@ void parse_ip_log(int argc, char **argv)
   }
  }
  sprintf(str,"%s/%s-%s.html",html_log_dir,year,month);
- printf("Writing %s ...",str);
+ printf("Writing %s ... ",str);
  f=fopen(str,"w");
- if(f)
+ if(f > 0)
  {
-  fprintf(f, "<table border><tr><th colspan=\"2\">%s %s</th><th align=\"right\">lms</th><th colspan=\"2\">Data transfers</th><th align=\"right\">Min.speed</th></tr>\n ",
+  fprintf(f, "<table class=\"decorated last\"><thead>\n\
+<tr><th colspan=\"2\">%s %s</th>\n\
+<th style=\"text-align: right\">lms</th>\n\
+<th colspan=\"2\">Data transfers</th>\n\
+<th style=\"text-align: right\">Min.speed</th>\n\
+</tr></thead><tbody>\n ",
              month, year);
 
+  row_odd_even = 0;
   for_each(iplog, iplogs)
   {
    if(iplog->traffic)
    {
-    fprintf(f, "<tr><td align=\"right\">%d</td><td align=\"left\"><a href=\"%s%s.log\">%s</td></td><td align=\"right\">", 
-               i++, log_url, iplog->name, iplog->name);  
+    fprintf(f, "%s<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: left\"><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</td>\n\
+<td style=\"text-align: right\">", 
+               tr_odd_even(), i++, log_url, iplog->name, iplog->name);  
     if(iplog->lmsid > 0)
     {
      /*base URL will be configurable soon ... */
-     fprintf(f, "<a href=\"%s%d\">%04d</a>\n", lms_url, iplog->lmsid, iplog->lmsid);
+     fprintf(f, "<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, iplog->lmsid, iplog->lmsid);
     }
     else if(iplog->lmsid == 0)
     {
      fputs("-------",f);
     }    
-    fprintf(f, "<td align=\"right\">%ld&nbsp;M</td><th align=\"right\">%ld G</th><td align=\"right\">%ld kbps</th></tr>\n",
+    fprintf(f, "<td style=\"text-align: right\">%ld&nbsp;MB</td>\n\
+    <td style=\"text-align: right\"><strong>%ld&nbsp;GB</strong></td>\n\
+    <td style=\"text-align: right\">%ld&nbsp;kb/s</th></tr>\n",
                iplog->traffic, iplog->traffic>>10, iplog->guaranted);
     total+=iplog->traffic>>10;
     iplog->i=i;
     iplog->l=total;
    }
   }
-  fprintf(f,"<tr><th colspan=\"4\" align=\"left\">Total:</th><th align=\"right\">%ld GB</th><th align=\"right\">%Ld kbps</th></tr>\n", total, line);
-  fputs("</table>\n", f);
+  fprintf(f,"</tbody><thead><tr>\
+  <th colspan=\"3\" style=\"text-align: left\">Total:</th>\
+  <th colspan=\"2\" style=\"text-align: right\"><strong>%ld&nbsp;GB</strong></th>\
+  <th style=\"text-align: right\"><strong>%Ld&nbsp;kb/s</strong></th></tr>\n", total, line);
+  fputs("</thead></table>\n", f);
 
+  row_odd_even = 0;
   if(i>10)
   {
-   fputs("<a name=\"erp\"></a><p><table border><tr><th colspan=\"5\">Enterprise Resource Planning (ERP)</th></tr>\n",f);
-   fputs("<tr><td>Analytic category</td>\n",f);
-   fputs("<td colspan=\"2\" align=\"center\">Active Classes</td><td colspan=\"2\" align=\"center\">Data transfers</td></tr>\n",f);
+   fputs("<a name=\"erp\"></a><p><table class=\"decorated last\">\n\
+<caption>Enterprise Resource Planning (ERP)</caption>\n\
+<thead><tr>\n\
+<th>Analytic category</th>\n\
+<th colspan=\"2\" style=\"text-align: center\">Active Classes</th>\n\
+<th colspan=\"2\" style=\"text-align: center\">Data transfers</th>\n\
+</tr></thead><tbody>\n",f);
 
    if_exists(iplog,iplogs,iplog->l>=total/4)
    {
-    fprintf(f,"<tr><td>Top 25%% of traffic</td>\n");
-    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));
+    fprintf(f,"%s<td>Top 25%% of traffic</td>\n", tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
+<td style=\"text-align: right\">%d %%</td></tr>\n",
+              iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
    }
    
    if_exists(iplog,iplogs,iplog->i==10)
    {
-    fprintf(f,"<tr><td>Top 10 downloaders</td>\n");
-    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));
+    fprintf(f,"%s<td>Top 10 downloaders</td>\n", tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\"><strong>10</strong></td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
+<td style=\"text-align: right\">%d %%</td></tr>\n",
+               (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
    }
 
    if_exists(iplog,iplogs,iplog->l>=total/2)
    {
-    fprintf(f,"<tr><td>Top 50%% of traffic</td>\n");
-    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));
+    fprintf(f,"%s<td>Top 50%% of traffic</td>\n", tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
+<td style=\"text-align: right\"><strong>%d %%</strong></td></tr>\n",
+              iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
    }
 
    if_exists(iplog,iplogs,iplog->l>=4*total/5)
    {
-    fprintf(f,"<tr><td>Top 80%% of traffic</td>\n");
-    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));
+    fprintf(f,"%s<td>Top 80%% of traffic</td>\n",tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
+<td style=\"text-align: right\"><strong>%d %%</strong></td></tr>\n",
+              iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
    }
 
    if_exists (iplog,iplogs,iplog->i>=i/5)
    {
-    fprintf(f,"<tr><td>Top 20%% downloaders</td>\n");
-    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));
+    fprintf(f,"%s<td>Top 20%% downloaders</td>\n",tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
+<td style=\"text-align: right\">%d %%</td></tr>\n",
+              iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
    }
 
    if_exists(iplog,iplogs,iplog->i>=i/4)
    {
-    fprintf(f,"<tr><td>Top 25%% downloaders</td>\n");
-    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));
+    fprintf(f,"%s<td>Top 25%% downloaders</td>\n", tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
+<td style=\"text-align: right\">%d %%</td></tr>\n",
+               iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
    }
 
    if_exists(iplog,iplogs,iplog->i>=i/2)
    {
-    fprintf(f,"<tr><td>Top 50%% downloaders</td>\n");
-    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));
+    fprintf(f,"%s<td>Top 50%% downloaders</td>\n",tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
+<td style=\"text-align: right\">%d %%</td></tr>\n",
+              iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
    }
 
    if_exists(iplog,iplogs,iplog->i>=4*i/5)
    {
-    fprintf(f,"<tr><td>Top 80%% downloaders</td>\n");
-    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));
+    fprintf(f,"%s<td>Top 80%% downloaders</td>\n",tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%ld GB</td>\n\
+<td style=\"text-align: right\">%d %%</td></tr>\n",
+              iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total));
    }
 
-   fprintf(f,"<tr><td>All users, all traffic</td>\n");
-   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);
-   fputs("</table>\n", f);
+   fprintf(f,"</tbody><thead><tr><th><a class=\"blue\" target=\"_blank\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);
+   fprintf(f,"<th style=\"text-align: right\">%d</th>\n\
+<th style=\"text-align: right\">100 %%</th>\n\
+<th style=\"text-align: right\">%ld GB</th>\n\
+<th style=\"text-align: right\">100 %%</th></tr>\n",i-1,total);
+   fputs("</thead></table>\n", f);
   }
 
   fprintf(f, stats_html_signature, version);
   fclose(f);
-  puts(" done.");
+  puts("done.");
+ }
+ else
+ {
+  perror(str);
+ }
+}
+
+void append_log(struct IP *self) /*using global variables*/
+{
+ char *d, *str;
+ FILE *f; 
+
+ date(d); /* this is typical cll1.h macro - prints current date */ 
+ string(str,STRLEN); 
+ sprintf(str,"%s/%s.log", log_dir, self->name);
+ f=fopen(str,"a");
+ if(f > 0)
+ {
+  fprintf(f,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",
+            time(NULL), self->name, self->traffic, self->direct, self->proxy,
+            self->upload, self->min, self->max, self->desired, self->lmsid, d); /* d = date*/
+  fclose(f);
+ }
+ else
+ {
+  perror(str);
  }
 }
 
+
 /*-----------------------------------------------------------------*/
 /* Are you looking for int main(int argc, char **argv) ? :-))      */
 /*-----------------------------------------------------------------*/
@@ -963,7 +1100,7 @@ program
   
  printf("\n\
 Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\
-Version %s - Copyright (C)2005-2011 Michael Polak (xChaos)\n\
+Version %s - Copyright (C)2005-2012 Michael Polak (xChaos)\n\
 iptables-restore & burst tunning & classify modification by Ludva\n\
 Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
@@ -1073,22 +1210,23 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     if(*ptr=='-')
     {
      *ptr=0;
-     ip->max=ip->desired=atoi(ptr+1);
+     ip->max = ip->desired=atoi(ptr+1);
     }
-    ip->min=atoi(substring);
-    if(ip->min<=0)
+    ip->min = atoi(substring);
+    if(ip->min <= 0)
     {
-     printf(" %s: Illegal value of minimum bandwidth 0 kbps, using %d kbps\n",str,free_min);
-     ip->min=free_min;
+     printf(" %s: Illegal value of minimum bandwidth 0 kbps, using %d kb/s\n",
+            str, free_min);
+     ip->min = free_min;
     }
-    if(ip->max<=ip->min)
+    if(ip->max <= ip->min)
     {
-     ip->fixedprio=1;
-     ip->max=ip->min+ip->keyword->reserve_min;
+     ip->fixedprio = 1;
+     ip->max = ip->min+ip->keyword->reserve_min;
     }
     else 
     {
-     ip->max-=ip->keyword->reserve_max;
+     ip->max -= ip->keyword->reserve_max;
      if(ip->max<ip->min)
      {
       ip->max=ip->min;
@@ -1099,13 +1237,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     if_exists(group,groups,group->min==ip->min) 
     { 
      group->count++;      
-     group->desired+=ip->min;
+     group->desired += ip->min;
      ip->group = group->id;   
     }
     else
     {
      create(group,Group);
-     group->min=ip->min;
+     group->min = ip->min;
      group->id = groupidx++;
      ip->group = group->id;
 
@@ -1148,7 +1286,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   }
   if(!sharedip)
   {
-   printf("Unresolved shared connection: %s %s sharing-%s\n",ip->addr,ip->name,ip->sharing);
+   printf("Unresolved shared connection: %s %s sharing-%s\n",
+          ip->addr, ip->name, ip->sharing);
   }
  }
 
@@ -1178,14 +1317,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   /*-----------------------------------------------------------------*/
   
   iptables_file=fopen(iptablesfile,"w");
-  if (iptables_file == NULL)
+  if(iptables_file == NULL)
   {
     puts("Cannot open iptablesfile!");
     exit(-1);
   }
   
   log_file=fopen(cmdlog,"w");
-  if (log_file == NULL) 
+  if(log_file == NULL) 
   {
     puts("Cannot open logfile!");
     exit(-1);
@@ -1242,7 +1381,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    save_line(":post_common - [0:0]");
    save_line(":forw_common - [0:0]");
 
-   for_each(ip,ips) if (ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0"))
+   for_each(ip,ips) if(ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0"))
    {
     buf=hash_id(ip->addr,bitmask);
     if_exists(idx,idxs,eq(idx->id,buf))
@@ -1298,7 +1437,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    for_each(idx,idxs)
    {
     subnet=subnet_id(idx->addr,idx->bitmask);
-    printf("%d: %s/%d\n",++i,subnet,idx->bitmask);
+    printf("%d: %s/%d\n",
+           ++i, subnet, idx->bitmask);
        
     sprintf(str,":post_%s - [0:0]", idx->id);
     save_line(str);
@@ -1352,7 +1492,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  if(just_flush)
  {
   fclose(iptables_file);
-  if (log_file) fclose(log_file);
+  if(log_file)
+  { 
+   fclose(log_file);
+  }
   puts("Just flushed iptables and tc classes - now exiting ...");
   exit(0);
  }
@@ -1497,19 +1640,35 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  else if(!dry_run && !just_flush)
  {
   /*-----------------------------------------------------------------*/
-  printf("Writing data transfer database ...\n");
+  printf("Writing daily statistics  %s ... ", json);
   /*-----------------------------------------------------------------*/
-  f=fopen("/var/run/prometheus.previous","w");
-  if(f)
+  f=fopen(json, "w");
+  if(f > 0)
   {
-   for_each(ip,ips) if(ip->traffic || ip->direct || ip->proxy || ip->upload)
+   int jsoncount=0;
+   fprintf(f, "{\n");
+   for_each(ip, ips)
    {
-    fprintf(f,"%s %Lu %Lu %Lu %Lu\n",
-              ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);
+    if(jsoncount)
+    {
+     fprintf(f, ",\n");
+    }
+    if(     ip->lmsid > 0 
+        && (ip->traffic || ip->direct || ip->proxy || ip->upload))
+    {
+     fprintf(f, " %d:{ \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu }",
+                ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);
+    }
+    jsoncount++;
    }
+   fprintf(f, "}\n");
    fclose(f);
+   puts("done.");
+  }
+  else
+  {
+   perror(json);
   }
-
   f=fopen(html,"w");
   ptr=html;
  }
@@ -1527,23 +1686,30 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   {
    fprintf(f,"<script type=\"text/javascript\" src=\"%s\"></script>\n", jquery_url);
   }
-  fputs("<table border>\n<tr><th align=\"right\">#</th><th align=\"right\">group</th><th align=\"right\">IPs</th><th align=\"right\">requested</th>\n",f);
+  fputs("<table class=\"decorated last\">\n\
+<caption>Bandwidth classes</caption>\n\
+<thead><tr>\n\
+<th style=\"text-align: right\">#</th>\n\
+<th style=\"text-align: right\">group</th>\n\
+<th style=\"text-align: right\">IPs</th>\n\
+<th style=\"text-align: right\">requested</th>\n",f);
   fprintf(f,"<th colspan=\"%d\">data limits</th>\n", keywordcount);
-  fputs("</tr>\n",f);
+  fputs("</tr></thead><tbody>\n",f);
 
+  row_odd_even = 0;
   for_each(group, groups) 
   { 
 #ifdef DEBUG
-   printf("%d k group: %d bandwidth requested: %d k\n",group->min,group->count,group->desired);
+   printf("%d kb/s group: %d bandwidth requested: %d kb/s\n",group->min,group->count,group->desired);
 #endif
-   fprintf(f,"<tr><td align=\"right\">%d</td><td align=\"right\">%d&nbsp;k</td>",
-             count, group->min);
-   fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d&nbsp;k</td>",
-             group->count, group->desired);
+   fprintf(f, "%s<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d&nbsp;kb/s</td>",
+              tr_odd_even(), count, group->min);
+   fprintf(f, "<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d&nbsp;kb/s</td>",
+              group->count, group->desired);
 
-   for_each(keyword, keywords)
+   for_each(keyword, keywords) if(keyword->ip_count)
    {
-    fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%d&nbsp;M</span></td>",
+    fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%d&nbsp;MB</span></td>",
               keyword->html_color, group->min*keyword->data_limit);
    }   
    i += group->desired; 
@@ -1551,20 +1717,22 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    count++; 
   }
 #ifdef DEBUG
-   printf("Total groups: %d Total bandwidth requested: %d k\nAGGREGATION: 1/%d\n",
+   printf("Total groups: %d Total bandwidth requested: %d kb/s\nAGGREGATION: 1/%d\n",
           count, i, i/line);
 #endif
-   fprintf(f,"<tr><th colspan=\"2\" align=\"left\">Line %Ld k</td>",line);
-   fprintf(f,"<th align=\"right\">%d</td><th align=\"right\">%d k</td>",total,i);
+   fprintf(f,"</tr></tbody>\n\
+<thead><tr>\n\
+<th colspan=\"2\" style=\"text-align: left\">Line %Ld kb/s</td>",line);
+   fprintf(f,"<th style=\"text-align: right\">%d</td><th style=\"text-align: right\">%d kb/s</td>",total,i);
 
-   for_each(keyword, keywords)
+   for_each(keyword, keywords) if(keyword->ip_count)
    {
-    fprintf(f,"<th align=\"right\">%d IPs</th>",keyword->ip_count);
+    fprintf(f,"<th style=\"text-align: right\">%d IPs</th>",keyword->ip_count);
    }
    fprintf(f,"</tr><tr><th colspan=\"4\">Aggregation 1/%d</th>\n", (int)(0.5+i/line));
    fprintf(f,"<th colspan=\"%d\">%d traffic classes</th></tr>\n", keywordcount, total);
 
-   fputs("</table>\n",f);
+   fputs("</thead></table>\n",f);
  }
  else if(!dry_run && !just_flush)
  {
@@ -1576,8 +1744,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  {
   unsigned long long total_traffic=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;
   int active_classes=0;
-  int colspan=11;
-  FILE *iplog;
+  int colspan=12;
   struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums=NULL;
   int limit_count=0, prio_count=0;
   int popup_button=0;
@@ -1586,32 +1753,39 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   {
    colspan++;
   }
-  if(found_lmsid)
-  {
-   colspan++;
-  }
   
-  fprintf(f,"<p><table border>\n<tr><th colspan=\"%d\">%s",colspan,title);
-  fprintf(f," (%s)</th></tr>\n", d);
-  fputs("<tr><td align=\"right\">#</td><td>hostname</td>",f);
-  if(found_lmsid)
-  {
-   fputs("<td align=\"right\">lms</td>\n",f);
-  }
-  fputs("<td align=\"right\">credit</td>\
-<td align=\"right\">limit</td>\
-<td align=\"right\">total</td>\
-<td align=\"right\">direct</td>\n",f);
+  fprintf(f,"<p><table class=\"decorated last\">\n<caption>%s",title);
+  fprintf(f," (%s)</caption>\n", d);
+  fputs("<thead><tr>\n<th colspan=\"3\">&nbsp;</th>\n",f);
+  fputs("<th style=\"text-align: right\">credit</th>\n\
+<th style=\"text-align: right\">FUP</th>\n\
+<th style=\"text-align: right\">total</th>\n\
+<th style=\"text-align: right\">down</th>\n",f);
   if(qos_proxy)
   {
-   fputs("<td align=\"right\">proxy</td>\n",f);
+   fputs("<th style=\"text-align: right\">proxy</th>\n",f);
   }
-  fputs("<td align=\"right\">upload</td>\
-<td align=\"right\">minimum</td>\
-<td align=\"right\">desired</td>\
-<td align=\"right\">maximum</td>\
-<td>prio</td></tr>\n",f);	
-
+  fputs("<th style=\"text-align: right\">up</th>\n\
+<th style=\"text-align: right\">min</th>\n\
+<th style=\"text-align: right\">max</th>\n\
+<th style=\"text-align: right\">limit</th>\n\
+<th>&nbsp;</th>\n\
+</tr><tr>\n\
+<th style=\"text-align: right\">#</th>\n\
+<th>hostname [+sharing]</th>\n\
+<th style=\"text-align: right\">LMS</th>\n\
+<th style=\"text-align: right\">MB</th>\n\
+<th style=\"text-align: right\">MB</th>\n\
+<th style=\"text-align: right\">MB</th>\n\
+<th style=\"text-align: right\">MB</th>\n\
+<th style=\"text-align: right\">MB</th>\n\
+<th style=\"text-align: right\">kb/s</th>\n\
+<th style=\"text-align: right\">kb/s</th>\n\
+<th style=\"text-align: right\">kb/s</th>\n\
+<th>prio</th>\n\
+</tr></thead><tbody>\n",f);	
+
+  row_odd_even = 0;
   for_each(ip,ips) if(!use_jquery_popups || !ip->sharing)
   {
    char *f1="", *f2="";
@@ -1634,20 +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); 
 #endif
    /* hostnames -------------------------------------- */
-   fprintf(f,"<tr><td align=\"right\"><a name=\"%s\"></a>%d</td><td><a href=\"%s%s.log\">%s</a>\n", ip->name, i, log_url, ip->name, ip->name);
+   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", 
+              tr_odd_even(), ip->name, i, log_url, ip->name, ip->name);
+
    if(use_jquery_popups)
    {
      fprintf(f,"<span id=\"sharing_%d\" style=\"display:none\">",i);
      popup_button=0;
      for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))
      {
-      fprintf(f,"<br /><a href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);
+      fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);
       popup_button++;
      }
      fputs("</span>\n",f);
      if(popup_button)
      {
-      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>",
+      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>",
                 i, i, i, popup_button);
      }
    }
@@ -1656,11 +1832,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
    if(found_lmsid)
    {
-    fputs("<td align=\"right\">",f);
+    fputs("<td style=\"text-align: right\">",f);
     if(ip->lmsid > 0)
     {
-     /*base URL will be configurable soon ... */
-     fprintf(f,"<a href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);
+     fprintf(f,"<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);
     }
     else if(ip->lmsid == 0)
     {
@@ -1668,20 +1843,20 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     }
     fputs("</td>\n",f);
    }
-   fprintf(f,"<td align=\"right\">%Lu&nbsp;M</td>\n", ip->credit);
-   fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%Lu&nbsp;M</span></td>",
+   fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->credit);
+   fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%Lu</span></td>",
              ip->keyword->html_color,
              ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));
-   fprintf(f,"<td align=\"right\">%s%Lu&nbsp;M%s", f1, ip->traffic, f2);
+   fprintf(f,"<td style=\"text-align: right\">%s%Lu%s", f1, ip->traffic, f2);
 
    /* download --------------------------------------- */
-   fprintf(f,"</td><td align=\"right\">%Lu&nbsp;M", ip->direct);
+   fprintf(f,"</td><td style=\"text-align: right\">%Lu", ip->direct);
    if(use_jquery_popups)
    {
      fprintf(f,"<span id=\"download_%d\" style=\"display:none\">",i);
      for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))
      {
-      fprintf(f,"<br />%Lu&nbsp;M", sharedip->direct);
+      fprintf(f,"<br />%Lu", sharedip->direct);
      }
      fputs("</span>\n",f);
    }
@@ -1690,24 +1865,29 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
    if(qos_proxy)
    {
-    fprintf(f,"<td align=\"right\">%Lu&nbsp;M</td>\n", ip->proxy);
+    fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->proxy);
    }
    /* upload ---------------------------------------- */
-   fprintf(f,"<td align=\"right\">%Lu&nbsp;M", ip->upload);
+   fprintf(f,"<td style=\"text-align: right\">%Lu", ip->upload);
    if(use_jquery_popups)
    {
      fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">",i);
      for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))
      {
-      fprintf(f,"<br />%Lu&nbsp;M", sharedip->upload);
+      fprintf(f,"<br />%Lu", sharedip->upload);
      }
      fputs("</span>\n",f);
    }
    fputs("</td>\n",f);
    /* ----------------------------------------------- */
 
-   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",
-             ip->min,ip->desired,f1,ip->max,f2,f1,ip->prio,f2);
+   fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%s%d%s</td>\n\
+<td>%s%d%s</td></tr>\n",
+             ip->min, ip->desired, 
+             f1, ip->max, f2, 
+             f1, ip->prio, f2);
 
    total_traffic+=ip->traffic;
    total_direct+=ip->direct;
@@ -1725,95 +1905,132 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
    if(!just_preview)
    {
-    sprintf(str,"%s/%s.log",log_dir,ip->name);
-    iplog=fopen(str,"a");
-    if(iplog)
+    append_log(ip);
+    for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))
     {
-     fprintf(iplog,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",
-                    time(NULL), ip->name, ip->traffic, ip->direct, ip->proxy,
-                    ip->upload, ip->min, ip->max, ip->desired, ip->lmsid, d); /* d = date*/
-     fclose(iplog);
+     append_log(sharedip);
     }
    }
   }
-  fprintf(f,"<tr><th colspan=\"%d\" align=\"left\">%d CLASSES</th>", colspan-7, i);
-  fprintf(f,"<th align=\"right\">%Lu&nbsp;M</th><th align=\"right\">%Lu&nbsp;M</th>\n", total_traffic, total_direct);
+  fprintf(f,"</tbody><thead><tr>\n\
+<th colspan=\"%d\" style=\"text-align: left\">%d CLASSES</th>", colspan-7, i);
+  fprintf(f,"<th style=\"text-align: right\">%Lu</th><th style=\"text-align: right\">%Lu</th>\n", total_traffic, total_direct);
   if(qos_proxy)
   {
-   fprintf(f,"<th align=\"right\">%Lu&nbsp;M</th>\n", total_proxy);
+   fprintf(f,"<th style=\"text-align: right\">%Lu</th>\n", total_proxy);
   }
-  fprintf(f,"<th align=\"right\">%Lu&nbsp;M</th>", total_upload);
-  fprintf(f,"<th colspan=\"4\"><span style=\"color:red\">FUP-LIMIT %dx</span> <span style=\"color:brown\">LOW-PRIO %dx</span></th></tr>\n</table>\n",limit_count,prio_count);
+  fprintf(f,"<th style=\"text-align: right\">%Lu</th>", total_upload);
+  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);
 
+  row_odd_even = 0;
   if(active_classes>10)
   {
    int top20_count=0,top20_perc1=0;
    long long top20_perc2=0;
    unsigned long long top20_sum=0l;
   
-   fputs("<a name=\"erp\"></a><p><table border><tr><th colspan=\"5\">Enterprise Resource Planning (ERP)</th></tr>\n",f);
-   fputs("<tr><td>Analytic category</td>\n",f);
-   fputs("<td colspan=\"2\" align=\"center\">Active Classes</td><td colspan=\"2\" align=\"center\">Data transfers</td></tr>\n",f);
+   fputs("<a name=\"erp\"></a><p><table class=\"decorated last\"><caption>Enterprise Resource Planning (ERP)</caption>\n",f);
+   fputs("<thead><tr>\n\
+<th>Analytic category</th>\n\
+<th colspan=\"2\" style=\"text-align: center\">Active Classes</th>\n\
+<th colspan=\"2\" style=\"text-align: center\">Data transfers</th>\n\
+</tr></thead><tbody>\n",f);
 
    if_exists(sum,sums,sum->l>=total_traffic/4)
    {
-    fprintf(f,"<tr><td>Top 25%% of traffic</td>\n");
-    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);
+    fprintf(f,"%s<td>Top 25%% of traffic</td>\n", tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%Lu MB</td>\n\
+<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);
    }
    
    if_exists(sum,sums,sum->i==10)
    {
-    fprintf(f,"<tr><td>Top 10 downloaders</td>\n");
-    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);
+    fprintf(f,"%s<td>Top 10 downloaders</td>\n", tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\"><strong>10</strong></td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%Lu MB</td>\n\
+<td style=\"text-align: right\">%Ld %%</td></tr>\n",
+              (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);
    }
 
    if_exists(sum,sums,sum->l>=total_traffic/2)
    {
-    fprintf(f,"<tr><td>Top 50%% of traffic</td>\n");
-    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);
+    fprintf(f,"%s<td>Top 50%% of traffic</td>\n", tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%Lu MB</td>\n\
+<td style=\"text-align: right\"><strong>%Ld %%</strong></td></tr>\n",
+              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
 
    if_exists(sum,sums,sum->l>=4*total_traffic/5)
    {
-    fprintf(f,"<tr><td>Top 80%% of traffic</td>\n");
-    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);
+    fprintf(f,"%s<td>Top 80%% of traffic</td>\n", tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%Lu MB</td>\n\
+<td style=\"text-align: right\"><strong>%Ld %%</strong></td></tr>\n",
+              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
 
    if_exists(sum,sums,sum->i>=(active_classes+1)/5)
    {
-    fprintf(f,"<tr><td>Top 20%% downloaders</td>\n");
+    fprintf(f,"%s<td>Top 20%% downloaders</td>\n", tr_odd_even());
     top20_count=sum->i;
     top20_perc1=(100*sum->i+50)/active_classes;
     top20_sum=sum->l;
     top20_perc2=(100*sum->l+50)/total_traffic;
-    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);
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\
+<td style=\"text-align: right\">%Lu MB</td>\n\
+<td style=\"text-align: right\">%Ld %%</td></tr>\n",
+              top20_count,top20_perc1,top20_sum,top20_perc2);
    }
 
    if_exists(sum,sums,sum->i>=(active_classes+1)/4)
    {
-    fprintf(f,"<tr><td>Top 25%% downloaders</td>\n");
-    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);
+    fprintf(f,"%s<td>Top 25%% downloaders</td>\n", tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%Lu MB</td>\n\
+<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);
    }
 
    if_exists(sum,sums,sum->i>=(active_classes+1)/2)
    {
-    fprintf(f,"<tr><td>Top 50%% downloaders</td>\n");
-    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);
+    fprintf(f,"%s<td>Top 50%% downloaders</td>\n", tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\
+<td style=\"text-align: right\">%Lu MB</td>\n\
+<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);
    }
 
    if_exists(sum,sums,sum->i>=4*(active_classes+1)/5)
    {
-    fprintf(f,"<tr><td>Top 80%% downloaders</td>\n");
-    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);
+    fprintf(f,"%s<td>Top 80%% downloaders</td>\n", tr_odd_even());
+    fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+<td style=\"text-align: right\">%d %%</td>\n\
+<td style=\"text-align: right\">%Lu MB</td>\n\
+<td style=\"text-align: right\">%Ld %%</td></tr></tbody>\n",
+              sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
 
-   fprintf(f,"<tr><td><a href=\"%sERP.log\">All users, all traffic</a></td>\n", log_url);
-   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);
-   fputs("</table>\n", f);
+   fprintf(f,"<thead><tr><th><a class=\"blue\" target=\"_blank\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);
+   fprintf(f,"<th style=\"text-align: right\">%d</th>\n\
+<th style=\"text-align: right\">100 %%</th>\n\
+<th style=\"text-align: right\">%Lu MB</th>\n\
+<th style=\"text-align: right\">100 %%</th></tr>\n",active_classes,total_traffic);
+   fputs("</thead></table>\n", f);
 
    /* write basic ERP data to log directory */
    if(!just_preview)
    {
+    FILE *iplog;
     sprintf(str,"%s/ERP.log",log_dir);
     iplog=fopen(str,"a");
     if(iplog)
@@ -1823,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*/
      fclose(iplog);
     }
+    else
+    {
+     perror(str);
+    }
    }
   }
 
@@ -1834,17 +2055,26 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  {
   puts("Statistics preview generated (-p switch) - now exiting ...");
   exit(0);
- }
-  
- /*-----------------------------------------------------------------*/
- puts("Generating iptables and tc classes ...");
- /*-----------------------------------------------------------------*/
+ }  
 
  i=0;
+#ifdef DEBUG
  printf("%-22s %-15s mark\n","name","ip");
+#endif
 
- for_each(ip,ips) if(ip->mark>0)
- { 
+ printf("Writing %s ... ", classmap); 
+ f = fopen(classmap, "w"); 
+ if(f < 0)
+ {
+  perror(classmap);
+ }
+
+ /*-----------------------------------------------------------------*/
+ puts("Generating iptables and tc classes ... ");
+ /*-----------------------------------------------------------------*/
+
+ for_each(ip, ips) if(ip->mark > 0)
+ {
   if(idxs)
   {
    char *buf;
@@ -1867,55 +2097,70 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    chain_postrouting="POSTROUTING";
   }
 
+#ifdef DEBUG
   printf("%-22s %-16s %04d ", ip->name, ip->addr, ip->mark); 
+#endif
 
   /* -------------------------------------------------------- mark download */
   
-  sprintf(str,"-A %s -d %s/32 -o %s -j %s%d",chain_postrouting,ip->addr,lan,mark_iptables,ip->mark);
+  sprintf(str, "-A %s -d %s/32 -o %s -j %s%d",
+               chain_postrouting, ip->addr, lan, mark_iptables, ip->mark);
   /*sprintf(str,"-A %s -d %s/32 -o %s -j MARK --set-mark %d",chain_postrouting,ip->addr,lan,ip->mark);*/
   /* -m limit --limit 1/s */  
   save_line(str);
 
   if(qos_proxy)
   {
-   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);
+   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);
    /*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);*/
    save_line(str);
   }
 
-  sprintf(str,"-A %s -d %s/32 -o %s -j ACCEPT",chain_postrouting,ip->addr,lan);
+  sprintf(str, "-A %s -d %s/32 -o %s -j ACCEPT",
+               chain_postrouting, ip->addr, lan);
   save_line(str);
 
   /* -------------------------------------------------------- mark upload */
-  sprintf(str,"-A %s -s %s/32 -o %s -j %s%d",chain_forward,ip->addr,wan,mark_iptables,ip->mark);
+  sprintf(str, "-A %s -s %s/32 -o %s -j %s%d", 
+               chain_forward, ip->addr, wan, mark_iptables, ip->mark);
   /*  sprintf(str,"-A %s -s %s/32 -o %s -j MARK --set-mark %d",chain_forward,ip->addr,wan,ip->mark);*/
   save_line(str);
 
-  sprintf(str,"-A %s -s %s/32 -o %s -j ACCEPT",chain_forward,ip->addr,wan);
+  sprintf(str, "-A %s -s %s/32 -o %s -j ACCEPT",
+               chain_forward, ip->addr, wan);
   save_line(str);
 
   if(ip->min)
   {
    /* -------------------------------------------------------- download class */
+#ifdef DEBUG
    printf("(down: %dk-%dk ", ip->min, ip->max); 
+#endif
 
-   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);
+   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);
    safe_run(str);
 
-   if (strcmpi(ip->keyword->leaf_discipline, "none"))
+   if(strcmpi(ip->keyword->leaf_discipline, "none"))
    {
-     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*/
+     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*/
      safe_run(str);
-   }   
-   if (filter_type == 1)
+   }
+
+   if(filter_type == 1)
    {
-     sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, lan, ip->mark, ip->mark);
+     sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",
+                  tc, lan, ip->mark, ip->mark);
      safe_run(str);
    }
 
    /* -------------------------------------------------------- upload class */
+#ifdef DEBUG
    printf("up: %dk-%dk)\n", (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), 
                             (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed));
+#endif
 
    sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",
                 tc, wan, ip->group, ip->mark,
@@ -1923,22 +2168,39 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
                 (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio);
    safe_run(str);
    
-   if (strcmpi(ip->keyword->leaf_discipline, "none"))
+   if(strcmpi(ip->keyword->leaf_discipline, "none"))
    {
-     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*/
+     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*/
      safe_run(str);
    }   
-   if (filter_type == 1)
+
+   if(filter_type == 1)
    {
-     sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",tc, wan, ip->mark, ip->mark);
+     sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",
+                  tc, wan, ip->mark, ip->mark);
      safe_run(str);
    }
+  
+   if(f)
+   {
+     fprintf(f, "%s %d\n", ip->addr, ip->mark);
+   }
   }
   else
+  {
+#ifdef DEBUG
    printf("(sharing %s)\n", ip->sharing);
+#endif
+  }
   i++;
  }
-
+ if(f)
+ {
+  puts("done.");
+  fclose(f);
+ }
+ 
  if(idxs)
  {
    chain_forward = "forw_common";
@@ -1952,31 +2214,36 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  /* -------------------------------- classify or reject free download */
  {
    char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */
-   if(free_min) final_chain = "ACCEPT";
+   if(free_min)
+   {
+    final_chain = "ACCEPT";
+   }
    if(qos_proxy)
    {
      if(free_min)
      {
-       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);
+       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);
        save_line(str);
      }
-     sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s",chain_postrouting,proxy_ip,proxy_port,lan,final_chain);
+     sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s",
+                  chain_postrouting,proxy_ip,proxy_port,lan,final_chain);
      save_line(str);
    }
    if(free_min)
    {
-     sprintf(str,"-A %s -o %s -j %s%d",chain_postrouting,lan,mark_iptables,3);
+     sprintf(str,"-A %s -o %s -j %s%d", chain_postrouting, lan, mark_iptables, 3);
      save_line(str);
    }
-   sprintf(str,"-A %s -o %s -j %s",chain_postrouting,lan,final_chain);
+   sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);
    save_line(str);
    /* ------------------------------- classify or reject free  upload */
    if(free_min)
    {
-     sprintf(str,"-A %s -o %s -j %s%d",chain_forward,wan,mark_iptables,3);
+     sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, 3);
      save_line(str);
    }
-   sprintf(str,"-A %s -o %s -j %s",chain_forward,wan,final_chain);
+   sprintf(str,"-A %s -o %s -j %s", chain_forward, wan, final_chain);
    save_line(str);
  }
 
@@ -1986,30 +2253,33 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    puts("Generating free bandwith classes ...");
    /*-----------------------------------------------------------------*/
    sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d",
-                tc,lan,parent,free_min,free_max,burst,lowest_priority);
+                tc, lan, parent, free_min, free_max,burst, lowest_priority);
    safe_run(str);
    sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d",
-                tc,wan,parent,free_min,free_max,burst,lowest_priority);
+                tc, wan, parent, free_min, free_max, burst, lowest_priority);
    safe_run(str);
    /* tc SFQ */
-   if (strcmpi(qos_leaf, "none"))
+   if(strcmpi(qos_leaf, "none"))
    {
-     sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,lan,qos_leaf);
+     sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s", tc, lan, qos_leaf);
      safe_run(str);
    
-     sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,wan,qos_leaf);
+     sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s", tc, wan, qos_leaf);
      safe_run(str);
    }   
    /* tc handle 1 fw flowid */
-   sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,lan);
+   sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3", tc, lan);
    safe_run(str);
 
-   sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,wan);
+   sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3", tc, wan);
    safe_run(str);
  }
  printf("Total IP count: %d\n", i);
  run_restore(); 
- if (log_file) fclose(log_file);
+ if(log_file)
+ {
+  fclose(log_file);
+ }
  return 0;
  /* that's all folks, thank you for reading it all the way up to this point ;-) */
  /* bad luck C<<1 is not yet finished, I promise no sprintf() next time... */