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

diff --git a/prometheus.c b/prometheus.c
index bd1a8d0..8c70bb0 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,7 +7,7 @@
 /*  Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
 
-/* Modified by: xChaos, 20110221
+/* 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"; 
+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-2008 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,13 +55,34 @@ 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) */
+char         *log_url = "/logs/"; /* log directory relative URI prefix (partial URL) */
 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 :-) ======= */
 
 void help(void)
@@ -85,6 +106,7 @@ void help(void)
 -s            start shaping! (keep data transfer statistics - but apply shaping)\n\
 */
 }
+
 /* === Configuraration file values defaults - stored in global variables ==== */
 
 int        filter_type = 1; /*1 mark, 2 classify*/
@@ -104,6 +126,7 @@ char       *wan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */
 char         *qos_leaf = "sfq perturb 5"; /* leaf discipline */
 char    *qos_free_zone = NULL; /* QoS free zone */
 int          qos_proxy = 1; /* include proxy port to QoS */
+int        found_lmsid = 0; /* show links to users in LMS information system */
 int     include_upload = 1; /* upload+download=total traffic */
 char         *proxy_ip = "192.168.1.1/32"; /* our IP with proxy port */
 int         proxy_port = 3128; /* proxy port number */
@@ -134,7 +157,7 @@ const int idxtable_treshold2 = 12;      /* this is no longer configurable */
 const int idxtable_bitmask1  = 3;        /* this is no longer configurable */
 const int idxtable_bitmask2  = 3;        /* this is no longer configurable */
 
-/* ==== This is C<<1 stuff - learn C<<1 first! http://cll1.arachne.cz ==== */
+/* ==== This is C<<1 stuff - learn C<<1 first! https://dev.arachne.cz/svn/cll1h ==== */
 
 struct IP
 {
@@ -148,6 +171,7 @@ struct IP
  int prio;
  int fixedprio;
  int group;
+ int lmsid;
  unsigned long long direct;
  unsigned long long proxy;
  unsigned long long upload;
@@ -185,7 +209,7 @@ struct Keyword
  int asymetry_ratio;        /* ratio for ADSL-like upload */
  int asymetry_fixed;        /* fixed treshold for ADSL-like upload */
  int data_limit;            /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */
- int data_prio;            /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */
+ int data_prio;             /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */
  long fixed_limit;          /* fixed data limit for setting lower HTB ceil */
  long fixed_prio;           /* fixed data lmit for setting lower HTB prio */
  int reserve_min;	    /* bonus for nominal HTB rate bandwidth (in kbps) */
@@ -205,15 +229,24 @@ struct Keyword
 void TheIP(void)
 {
  create(ip,IP);
- ip->name="";
- ip->addr="";
- ip->sharing=NULL;
- ip->prio=highest_priority+1;
- ip->fixedprio=0;
- ip->mark=ip->min=ip->max=ip->desired=ip->credit=0;
- ip->upload=ip->proxy=ip->direct=ip->traffic=0;
- ip->pktsup=ip->pktsdown=0;
- ip->keyword=keywords;
+ ip->name        = "";
+ ip->addr        = "";
+ ip->sharing     = NULL;
+ ip->prio        = highest_priority+1;
+ ip->lmsid       = -1;
+ ip->fixedprio   = \
+ ip->mark        = \
+ ip->min         = \
+ ip->max         = \
+ ip->desired     = \
+ ip->credit      = \
+ ip->upload      = \
+ ip->proxy       = \
+ ip->direct      = \
+ ip->traffic     = \
+ ip->pktsup      = \
+ ip->pktsdown    = 0;
+ ip->keyword     = keywords;
  push(ip,ips);
 }
 
@@ -222,17 +255,21 @@ 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);
  /* debug printf("(%s,%d) -> ",ip,bitmask); */
 
  if(ip && *ip && bitmask>=0 && bitmask<=32)
+ {
   string(outip,strlen(ip)+10); /*fuck unicode? assertion: 10>strlen("_%d_%d") */
+ }
  else 
+ {
   /* should never exit here */
   return "undefined";
+ }
  outptr=outip;
  while(ip && *ip)
  {
@@ -241,31 +278,51 @@ char *very_ugly_ipv4_code(char *inip,int bitmask,int format_as_chainname)
    if(dot<(bitmask/8-1)) 
    {
     if(format_as_chainname)
+    {
      *outptr='_';
+    }
     else
+    {
      *outptr='.';
+    }
     outptr++;
     dot++;
    }
    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;
@@ -284,10 +341,14 @@ char *very_ugly_ipv4_code(char *inip,int bitmask,int format_as_chainname)
 }
 
 char *hash_id(char *ip,int bitmask)
-{ return very_ugly_ipv4_code(ip,bitmask,1); }
+{ 
+ return very_ugly_ipv4_code(ip,bitmask,1);
+}
 
 char *subnet_id(char *ip,int bitmask)
-{ return very_ugly_ipv4_code(ip,bitmask,0); }
+{
+ return very_ugly_ipv4_code(ip,bitmask,0);
+}
 
 /* ================= Let's parse configuration file here =================== */
 
@@ -319,9 +380,6 @@ void get_config(char *config_filename)
    keyword->fixed_prio=0;              /* fixed data limit for setting lower HTB prio */
    keyword->reserve_min=8;	       /* bonus for nominal HTB rate bandwidth (in kbps) */
    keyword->reserve_max=0;	       /* malus for nominal HTB ceil (in kbps) */
-/* obsolete:
-   keyword->divide_max=0;	       relative malus: new_ceil=rate+(old_ceil-rate)/divide_max
-   keyword->htb_ceil_bonus_divide=0;   relative bonus: new_ceil=old_ceil+old_ceil/htb_ceil_bonus_divide */
    keyword->default_prio=highest_priority+1;
    keyword->html_color="000000";
    keyword->ip_count=0;
@@ -339,7 +397,6 @@ void get_config(char *config_filename)
     {
      int l=strlen(keyword->key);
 
-
      if(!strncmp(keyword->key,_,l) && strlen(_)>l+2)
      {
       char *tmptr=_; /*  <---- l+1 ----> */
@@ -353,17 +410,15 @@ void get_config(char *config_filename)
       ioption("htb-default-prio",keyword->default_prio);
       ioption("htb-rate-bonus",keyword->reserve_min);
       ioption("htb-ceil-malus",keyword->reserve_max);
-  /* obsolete:
-      ioption("htb-ceil-divide",keyword->divide_max);
-      ioption("htb-ceil-bonus-divide",keyword->htb_ceil_bonus_divide);
-  */
       option("leaf-discipline",keyword->leaf_discipline);
       option("html-color",keyword->html_color);
       _=tmptr;
       
       if(keyword->data_limit || keyword->fixed_limit || 
          keyword->data_prio || keyword->fixed_prio)
-          use_credit=1;        
+      {
+       use_credit=1;        
+      }
      }
     }
   }
@@ -372,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);
@@ -383,13 +438,18 @@ 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);
   option("log-traffic-url-path",log_url);
+  option("jquery-url",jquery_url);
+  option("lms-url",lms_url);
+  ioption("use-jquery-popups",use_jquery_popups);
   option("qos-free-zone",qos_free_zone);
   ioption("qos-free-delay",qos_free_delay);
   ioption("qos-proxy-enable",qos_proxy);
@@ -405,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);
@@ -420,23 +479,26 @@ 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")){
-    filter_type = 2;
-    mark = "CLASSIFY";
-    mark_iptables = "CLASSIFY --set-class 1:";
- }else{
-    filter_type = 1;
-    mark = "MARK";
-    mark_iptables = "MARK --set-mark ";
+ if(strcmpi(cnf, "mark"))
+ {
+  filter_type = 2;
+  mark = "CLASSIFY";
+  mark_iptables = "CLASSIFY --set-class 1:";
+ }
+ else
+ {
+  filter_type = 1;
+  mark = "MARK";
+  mark_iptables = "MARK --set-mark ";
  }
 
  /* are supplied values meaningful ?*/
@@ -480,45 +542,75 @@ 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;
   }
   
     if(accept && traffic>0 && ipaddr)
     {
-     if(proxyflag)printf("(proxy) ");
-     else if(!downloadflag) printf("(upload) ");
-     printf("IP %s: %Lu M (%ld pkts)\n", ipaddr, traffic, pkts);
+     if(proxyflag)
+     {
+      printf("(proxy) ");
+     }
+     else if(!downloadflag)
+     {
+      printf("(upload) ");
+     }
+     printf("IP %s: %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts);
 
      if_exists(ip,ips,eq(ip->addr,ipaddr)); 
      else 
@@ -536,9 +628,13 @@ void get_traffic_statistics(void)
      if(downloadflag)
      {
       if(proxyflag)
+      {
        ip->proxy=traffic;
+      }
       else
+      {
        ip->traffic+=traffic;
+      }
       ip->direct=ip->traffic-ip->upload-ip->proxy;
       ip->pktsdown=pkts;
      }
@@ -547,23 +643,38 @@ void get_traffic_statistics(void)
       ip->upload=traffic;
       ip->pktsup=pkts;
       if(include_upload)
+      {
        ip->traffic+=traffic;
+      }
       else 
+      {
        if(traffic>ip->traffic)
+       {
         ip->traffic=traffic;     
+       }
+      }
      }
     }  
   }
-
- free(cmd);
+  free(cmd);
 }
  
 /* ========== This function executes, logs OR ALSO prints command ========== */
 
 void safe_run(char *cmd)
 {
- if(dry_run) printf("\n=>%s\n",cmd); else system(cmd);
- if(log_file) fprintf(log_file,"%s\n",cmd);
+ if(dry_run)
+ {
+  printf("\n=>%s\n",cmd);
+ }
+ else
+ {
+  system(cmd);
+ }
+ if(log_file)
+ {
+  fprintf(log_file,"%s\n",cmd);
+ }
 }
 
 void save_line(char *line)
@@ -573,22 +684,22 @@ void save_line(char *line)
 
 void run_restore(void)
 {
- char *restor, *str;
+ char *restor;
  string(restor,STRLEN);
 
  /*-----------------------------------------------------------------*/
- printf("Running %s <%s ...\n",iptablesrestore,iptablesfile);
+ printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);
  /*-----------------------------------------------------------------*/
  
  save_line("COMMIT");
  fclose(iptables_file);
  if(dry_run) 
  {
-    parse(iptablesfile)
-    {
-        str=_;
-        printf("%s\n", str);
-    }done;
+  parse(iptablesfile)
+  {
+   printf("%s\n",_);
+  }
+  done;
  }
 
  sprintf(restor,"%s <%s",iptablesrestore, iptablesfile);
@@ -601,19 +712,37 @@ void run_restore(void)
 
 void parse_ip(char *str)
 {
- char *ptr=str,*ipaddr=NULL,*ipname=NULL;;
+ char *ptr,*ipaddr=NULL,*ipname=NULL,*lmsid=NULL;
+
+ ptr=strchr(str,'{');
+ if(ptr)
+ {
+  lmsid=++ptr;
+  while(*ptr && *ptr!='}')
+  {
+   ptr++;
+  }
+  *ptr=0;
+ }
  
+ ptr=str;
  while(*ptr && *ptr!=' ' && *ptr!=9)
+ {
   ptr++;
+ }
  
  *ptr=0;
  ipaddr=str;
  ptr++;
  while(*ptr && (*ptr==' ' || *ptr==9))
+ {
   ptr++;
+ }
  ipname=ptr; 
  while(*ptr && *ptr!=' ' && *ptr!=9)
+ {
   ptr++;
+ }
  *ptr=0;
 
  if_exists(ip,ips,eq(ip->addr,ipaddr));
@@ -623,6 +752,11 @@ void parse_ip(char *str)
  }
  ip->addr=ipaddr;
  ip->name=ipname;
+ if(lmsid)
+ {
+  ip->lmsid=atoi(lmsid);
+  found_lmsid=1;
+ }
 }
 
 char *parse_datafile_line(char *str)
@@ -636,7 +770,9 @@ char *parse_datafile_line(char *str)
   return ptr;
  } 
  else 
+ {
   return NULL;
+ }
 }
 
 struct IpLog
@@ -645,6 +781,7 @@ struct IpLog
  long traffic;
  long guaranted;
  int i;
+ int lmsid;
  long l;
  list(IpLog);
 } *iplog,*iplogs;
@@ -653,7 +790,7 @@ void parse_ip_log(int argc, char **argv)
 {
  char *month, *year, *str, *name="(undefined)", *ptr, *ptr2, *filename;
  long traffic=0l, traffic_month, total=0, guaranted;
- int col, col2, y_ok, m_ok, accept_month, i=1, any_month=0;
+ int col, col2, y_ok, m_ok, accept_month, i=1, any_month=0, lmsid;
  char mstr[4], ystr[5];
  FILE *f; 
  string(str,STRLEN);
@@ -708,7 +845,8 @@ void parse_ip_log(int argc, char **argv)
     printf("Parsing %s ...",filename);
     accept_month=0;
     traffic_month=0;
-    guaranted = 0;
+    guaranted=0;
+    lmsid=-1;
     parse(filename)
     {
      y_ok=m_ok=0;  
@@ -716,11 +854,12 @@ void parse_ip_log(int argc, char **argv)
      {
       case 2: name = ptr;break;
       case 3: traffic = atol(ptr);break;
-      /* column number   - was 7, now 10...*/
+      /* column number   - was 7, now 11...*/
       case 7:
       case 8:
       case 9:
-      case 10: if (isalpha(*ptr)) /* character, not numeric string = date, just one*/
+      case 10:
+      case 11: if(isalpha(*ptr)) /* character, not numeric string = date, just one*/
                {
                 valid_columns(ptr2,ptr,' ',col2) switch(col2)
                 {
@@ -731,6 +870,7 @@ void parse_ip_log(int argc, char **argv)
                else
                {
                  if(col == 7) guaranted = atol(ptr);
+                 if(col == 10) lmsid = atoi(ptr);
                }
      }
      
@@ -748,6 +888,7 @@ void parse_ip_log(int argc, char **argv)
      iplog->name = name;
      iplog->guaranted = guaranted;
      iplog->traffic = traffic_month;
+     iplog->lmsid = lmsid;
      insert(iplog,iplogs,desc_order_by,traffic);
      printf(" %ld MB\n",iplog->traffic);
     }
@@ -758,91 +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 colspan=\"2\">Data transfers</th><th align=\"right\">Min.speed</th></tr>\n ",month,year);
-
-  for_each(iplog,iplogs)
+  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><th align=\"left\">%s</td><td align=\"right\">%ld M</td><th align=\"right\">%ld G</th><td align=\"right\">%ld kbps</th></tr>\n",
-              i++, iplog->name, iplog->traffic, iplog->traffic>>10, iplog->guaranted);
+    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 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 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=\"3\" 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 Research and 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) ? :-))      */
 /*-----------------------------------------------------------------*/
@@ -860,13 +1093,14 @@ program
  int just_preview=FALSE;                /* preview - generate just stats */
  int just_logs=FALSE;                   /* just parse logs */
  int run=FALSE;
+ int total=0;
  
  char *chain_forward, *chain_postrouting;
  char *althosts=NULL;
   
  printf("\n\
 Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\
-Version %s - Copyright (C)2005-2008 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);
 
@@ -936,7 +1170,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   str=_;
 
   if(*str<'0' || *str>'9')
+  {
+   /* any line starting with non-number is comment ...*/
    continue;
+  }
   
   //Does this IP share QoS class with some other ?
   substring=strstr(str,"sharing-");
@@ -948,7 +1185,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    ip->sharing=substring;
    ip->keyword=defaultkeyword; /* settings for default keyword */
    while(*substring && *substring!='\n')
+   {
     substring++;
+   }
    *substring=0; 
   }
   else
@@ -965,48 +1204,46 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     substring+=strlen(keyword->key)+1;
     ptr=substring;
     while(*ptr && *ptr!='-')
+    {
      ptr++;
+    }
     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;
-
-/*
-     if(ip->keyword->divide_max>1)
-      ip->max=ip->min+(ip->max-ip->min)/ip->keyword->divide_max;
-     if(ip->keyword->htb_ceil_bonus_divide>0)
-      ip->max+=ip->max/ip->keyword->htb_ceil_bonus_divide;
-*/
+     ip->max -= ip->keyword->reserve_max;
      if(ip->max<ip->min)
+     {
       ip->max=ip->min;
+     }
     }
     ip->mark=FIRSTIPCLASS+1+class_count++;
 
     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;
 
@@ -1037,17 +1274,21 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  /*-----------------------------------------------------------------*/
  puts("Resolving shared connections ...");
  /*-----------------------------------------------------------------*/
- for_selected(ip,ips,ip->sharing)
+ for_each(ip,ips) if(ip->sharing)
  {
-  for_selected(sharedip,ips,eq(sharedip->name,ip->sharing))
+  for_each(sharedip,ips) if(eq(sharedip->name,ip->sharing))
   {
    sharedip->traffic+=ip->traffic;
    ip->traffic=0;
    ip->mark=sharedip->mark; 
+   ip->lmsid=sharedip->lmsid;
    break;
   }
   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);
+  }
  }
 
  if(enable_credit && just_flush<9)
@@ -1076,13 +1317,15 @@ 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);
   }
@@ -1119,7 +1362,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     chain="post_noproxy";    
    }
    else
+   {
     chain="POSTROUTING";
+   }
     
    sprintf(str,"-A %s -s %s -o %s -j ACCEPT", chain, qos_free_zone, lan);
    save_line(str);
@@ -1136,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_selected(ip,ips,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))
@@ -1162,7 +1407,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     bitmask-=idxtable_bitmask2;
     idxcount=0;
 
-    for_selected(idx,idxs,idx->parent==NULL)
+    for_each(idx,idxs) if(idx->parent == NULL)
     {
      buf=hash_id(idx->addr,bitmask);
      if_exists(metaindex,idxs,eq(metaindex->id,buf))
@@ -1189,11 +1434,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    sort(idx,idxs,order_by,bitmask);
 
    i=0;
-
    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);
@@ -1207,7 +1452,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      sprintf(buf,"post_%s",idx->parent->id);
     }
     else
+    {
      buf="POSTROUTING";
+    }
 
     sprintf(str,"-A %s -d %s/%d -o %s -j post_%s", buf, subnet, idx->bitmask, lan, idx->id);
     save_line(str);
@@ -1221,7 +1468,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      sprintf(buf,"forw_%s",idx->parent->id);
     }
     else
+    {
      buf="FORWARD";
+    }
 
     sprintf(str,"-A %s -s %s/%d -o %s -j forw_%s", buf, subnet, idx->bitmask, wan, idx->id);
     save_line(str);
@@ -1243,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);
  }
@@ -1256,7 +1508,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    sleep(qos_free_delay);
   }
 
-  sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",tc,lan,htb_r2q);
+  sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",
+              tc,lan,htb_r2q);
   safe_run(str);
 
   sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d",
@@ -1282,18 +1535,20 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  /*-----------------------------------------------------------------*/
  puts("Locating heavy downloaders and generating root classes ...");
  /*-----------------------------------------------------------------*/
- sort(ip,ips,desc_order_by,traffic);
- 
+ sort(ip,ips,desc_order_by,traffic); 
 
  /*-----------------------------------------------------------------*/
  /* sub-scope - local variables */  
  {
-  long long int rate=line;
-  long long int max=line;
-  int group_count=0;
-  FILE *credit_file=NULL;
+  long long int rate = line;
+  long long int max = line;
+  int group_count = 0;
+  FILE *credit_file = NULL;
   
-  if(!just_preview && !dry_run && enable_credit) credit_file=fopen(credit,"w");
+  if(!just_preview && !dry_run && enable_credit)
+  {
+   credit_file = fopen(credit,"w");
+  }
     
   for_each(group,groups)
   {
@@ -1310,51 +1565,71 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     safe_run(str);
    }
    
-   if(group_count++<max_nesting) parent=group->id;
+   if(group_count++ < max_nesting)
+   {
+    parent = group->id;
+   }
    
-   rate-=digital_divide*group->min;
-   if(rate<group->min)rate=group->min;
+   rate -= digital_divide*group->min;
+   if(rate < group->min)
+   {
+    rate = group->min;
+   }
     
    /*shaping of aggresive downloaders, with credit file support */
    if(use_credit)
    {
-    int group_rate=group->min, priority_sequence=lowest_priority;
+    int group_rate = group->min, priority_sequence = lowest_priority;
     
-    for_selected(ip, ips, ip->min==group->min && ip->max>ip->min)
+    for_each(ip, ips) if(ip->min == group->min && ip->max > ip->min)
     {
-     if( ip->keyword->data_limit && !ip->fixedprio &&
-         ip->traffic>ip->credit+
-         (ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)) )
+     if(    ip->keyword->data_limit && !ip->fixedprio 
+         && (   ip->traffic>ip->credit
+              + (ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))) )
      {
-      if(group_rate<ip->max) ip->max=group_rate;
+      if(group_rate<ip->max)
+      {
+       ip->max=group_rate;
+      }
       group_rate+=magic_treshold;
       ip->prio=lowest_priority;
-      if(ip->prio<highest_priority+2) ip->prio=highest_priority+2;
+      if(ip->prio<highest_priority+2)
+      {
+       ip->prio=highest_priority+2;
+      }
      }
      else
      {
-      if( ip->keyword->data_prio && !ip->fixedprio &&
-          ip->traffic>ip->credit+
-           (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20)) )
+      if(    ip->keyword->data_prio 
+          && !ip->fixedprio 
+          && (   ip->traffic>ip->credit
+               + (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20))) )
       {
        ip->prio=priority_sequence--;
-       if(ip->prio<highest_priority+1) ip->prio=highest_priority+1;
+       if(ip->prio<highest_priority+1)
+       {
+        ip->prio=highest_priority+1;
+       }
       }
      
       if(credit_file)
       {
        unsigned long long lcredit=0;
        
-       if((ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))>ip->traffic) 
+       if((ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))>ip->traffic)
+       {
         lcredit=(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))-ip->traffic;
+       }
        fprintf(credit_file,"%s %Lu\n",ip->addr,lcredit);
       }
      }
-    }
-        
+    }        
    }
   }
-  if(credit_file)fclose(credit_file);
+  if(credit_file)
+  {
+   fclose(credit_file);
+  }
  }
 
  if(just_preview)
@@ -1365,123 +1640,256 @@ 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_selected(ip,ips,ip->traffic || ip->direct || ip->proxy ||ip->upload)
-    fprintf(f,"%s %Lu %Lu %Lu %Lu\n",ip->addr,ip->traffic,ip->direct,ip->proxy,ip->upload);
+   int jsoncount=0;
+   fprintf(f, "{\n");
+   for_each(ip, ips)
+   {
+    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;
  }
 
  if(f)
  {
-  int total=0;
   int count=1;
   i=0;
 
   /*-----------------------------------------------------------------*/
-  printf("Sorting data and generating statistics page %s ...\n",ptr);
+  printf("Sorting data and generating statistics page %s ...\n", ptr);
   /*-----------------------------------------------------------------*/
 
-  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);
-  fprintf(f,"<th colspan=\"%d\">data limits</th>\n",keywordcount);
-  fputs("</tr>\n",f);
-
-  for_each(group,groups) 
+  if(use_jquery_popups)
+  {
+   fprintf(f,"<script type=\"text/javascript\" src=\"%s\"></script>\n", jquery_url);
+  }
+  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></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 k</td>",count,group->min);
-   fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d 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\"><font color=\"#%s\">%d M</font></td>",keyword->html_color,group->min*keyword->data_limit);
+    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; 
-   total+=group->count;
+   i += group->desired; 
+   total += group->count;
    count++; 
   }
 #ifdef DEBUG
-   printf("Total groups: %d Total bandwidth requested: %d k\nAGGREGATION: 1/%d\n",count,i,i/line);
+   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);
+   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) 
+ else if(!dry_run && !just_flush)
+ {
   perror(html);
+ }
 
- i=1;
+ i=0;
  if(f)
  {
-  unsigned long long total=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;
+  unsigned long long total_traffic=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;
   int active_classes=0;
-  int colspan;
-  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;
 
   if(qos_proxy)
-   colspan=12;
-  else 
-   colspan=11;
+  {
+   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>\
-  <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("<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);	
-
-  for_each(ip,ips)
+  {
+   fputs("<th style=\"text-align: right\">proxy</th>\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="";
-   if(ip->max<ip->desired)
+   i++;
+      
+   if(ip->max < ip->desired)
    {
-    f1="<font color=\"red\">";
-    f2="</font>";
+    f1="<span style=\"color:red\">";
+    f2="</span>";
+    limit_count++;
    }
-   else if(ip->prio>highest_priority+1)
+   else if(ip->prio > highest_priority+1)
    {
-    f1="<font color=\"brown\">";
-    f2="</font>";
+    f1="<span style=\"color:brown\">";
+    f2="</span>";
+    prio_count++;
    }
 
 #ifdef DEBUG
    printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); 
 #endif
-   fprintf(f,"<tr><td align=\"right\"><a name=\"%s\"></a>%d</td><td><a href=\"%s%s.log\">%s</a></td><td align=\"right\">%Lu M</td>\n",
-              ip->name, i, log_url, ip->name, ip->name, ip->credit);
-   fprintf(f,"<td align=\"right\"><font color=\"#%s\">%Lu M</font></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 M%s</td><td align=\"right\">%Lu M</td>\n", f1, ip->traffic, f2, ip->direct);
+   /* hostnames -------------------------------------- */
+   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 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 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);
+     }
+   }
+   fputs("</td>\n",f);
+   /* ----------------------------------------------- */
+
+   if(found_lmsid)
+   {
+    fputs("<td style=\"text-align: right\">",f);
+    if(ip->lmsid > 0)
+    {
+     fprintf(f,"<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);
+    }
+    else if(ip->lmsid == 0)
+    {
+     fputs("-------",f);
+    }
+    fputs("</td>\n",f);
+   }
+   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 style=\"text-align: right\">%s%Lu%s", f1, ip->traffic, f2);
+
+   /* download --------------------------------------- */
+   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", sharedip->direct);
+     }
+     fputs("</span>\n",f);
+   }
+   fputs("</td>\n",f);
+   /* ----------------------------------------------- */
+
    if(qos_proxy)
-    fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->proxy);
-   fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->upload);
-   fprintf(f,"<td align=\"right\">%d k</td><td align=\"right\">%d k</td><td align=\"right\">%s%d k%s</td><td>%s%d%s</td></tr>\n",ip->min,ip->desired,f1,ip->max,f2,f1,ip->prio,f2);
-   total+=ip->traffic;
+   {
+    fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->proxy);
+   }
+   /* 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", sharedip->upload);
+     }
+     fputs("</span>\n",f);
+   }
+   fputs("</td>\n",f);
+   /* ----------------------------------------------- */
+
+   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;
    total_proxy+=ip->proxy;
    total_upload+=ip->upload;
@@ -1494,88 +1902,151 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     sum->i=active_classes;
     insert(sum,sums,order_by,i);
    }
-   
-   i++;
-   
+
    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%s",
-                    time(NULL),ip->name,ip->traffic,ip->direct,ip->proxy,ip->upload,ip->min,ip->max,ip->desired,d); /* d = date*/
-     fclose(iplog);
+     append_log(sharedip);
     }
    }
-
   }
-  fprintf(f,"<tr><th colspan=\"4 \"align=\"left\">SUMMARY:</td>");
-  fprintf(f,"<th align=\"right\">%Lu M</th>\
-  <th align=\"right\">%Lu M</th>\n", total, 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 M</th>\n", total_proxy);
-  fprintf(f,"<th align=\"right\">%Lu M</th>", total_upload);
-  fputs("<td colspan=\"4\"></td></th>\n</table>\n",f);
+  {
+   fprintf(f,"<th style=\"text-align: right\">%Lu</th>\n", total_proxy);
+  }
+  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)
   {
-   fputs("<a name=\"erp\"></a><p><table border><tr><th colspan=\"5\">Enterprise Research and 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);
-
-   if_exists(sum,sums,sum->l>=total/4)
+   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 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);
+    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);
+    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/2)
+   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);
+    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/5)
+   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);
+    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)
+   if_exists(sum,sums,sum->i>=(active_classes+1)/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\">%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);
+    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 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);
+    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);
+    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);
+    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>All users, all traffic</td>\n");
-   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);
-   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)
+    {
+     fprintf(iplog,"%ld\t%d\t%d %%\t%Lu M\t%Ld %%\tACTIVE %d\tTRAFFIC %Lu M\tCLASSES %d\tFUP-LIMIT %d\tLOW-PRIO %d\t%s",
+                   time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, 
+                   active_classes, total_traffic, i, limit_count, prio_count, d); /* d = date*/
+     fclose(iplog);
+    }
+    else
+    {
+     perror(str);
+    }
+   }
   }
+
   fprintf(f, stats_html_signature, version);
   fclose(f);
  }
@@ -1584,18 +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_selected(ip,ips,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;
@@ -1618,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,
@@ -1674,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";
@@ -1703,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);
  }
 
@@ -1737,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... */