X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=5420588d352e8d6550e0c430305926ea2e33bfc2;hp=d8eaef2d44f4dee405ef9d603ce9b082cffdca43;hb=b014f18189d582cd408e0c488ef734a070500e5b;hpb=b1b59b3a2f8b0ced214ac4a832966bd3239a8610

diff --git a/prometheus.c b/prometheus.c
index d8eaef2..5420588 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,9 +7,9 @@
 /*  Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
 
-/* Modified: xChaos, 20080422
-             ludva, 20080415
-
+/* Modified by: xChaos, 20110428
+                 ludva, 20080415
+ 
    Prometheus QoS is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as 
    published by the Free Software Foundation; either version 2.1 of 
@@ -31,34 +31,36 @@
 #define FIRSTIPCLASS 2048
 #undef DEBUG
 
-#include "cll1-0.6.h"
+#include "cll1-0.6.2.h"
 
-const char *version="0.7.9-c"; 
+const char *version = "0.8.3"; 
 
-/* Version numbers: 0.7.9 will be last development ("beta"), 0.8.0 first stable */
+/* 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";
+
 /* ======= 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              *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 */
-char *ls              = "/bin/ls"; /* this is not user configurable :-) */
+const char        *ls = "/bin/ls"; /* this is not user configurable :-) */
 
-char *config          = "/etc/prometheus/prometheus.conf"; /* main configuration file */
-char *hosts           = "/etc/prometheus/hosts"; /* per-IP bandwidth definition file */
+char          *config = "/etc/prometheus/prometheus.conf"; /* main configuration file */
+char           *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition file */
 
-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 *preview         = "/var/www/preview.html"; /* hall of fame preview */
-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 *html_log_dir    = "/var/www/logs/html/";
+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         *preview = "/var/www/preview.html"; /* hall of fame preview */
+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    *html_log_dir = "/var/www/logs/html/";
 
 /* ======= Help screen is hopefuly self-documenting part of code :-) ======= */
 
@@ -67,74 +69,74 @@ void help(void)
  puts("Command line switches:\n\
 \n\
 -?, --help    this help screen\n\
--v, --version show version number of this utility and exit\n\
--c filename   force alternative /etc/prometheus.conf filename\n\
--h filename   force alternative /etc/hosts filename (overrides hosts keyword)\n\
--f            just flush iptables and tc classes and exit (stop shaping)\n\
+-v, --version show Version number of this utility and exit\n\
+-c filename   force alternative /etc/prometheus.Conf filename\n\
+-h filename   force alternative /etc/Hosts filename (overrides hosts keyword)\n\
+-f            just Flush iptables and tc classes and exit (stop shaping)\n\
 -9            emergency iptables flush (do not read data transfer statistics)\n\
--p            just generate preview of data transfer statistics and exit\n\
--n            no delay (overrides qos-free-delay keyword)\n\
--d            dry run (preview tc and iptables commands on stdout)\n\
--l Mmm YYYY   generate HTML summary of traffic logs (Mmm=Jan-Dec or Year, YYYY=year)\n\
--m            generate HTML summary of traffic logs for yesterday's month\n\
--y            generate HTML summary of traffic logs for yesterday's year\n");
+-p            just generate Preview of data transfer statistics and exit\n\
+-d            Dry run (preview tc and iptables commands on stdout)\n\
+-r            Run (reset all statistics and start shaping)\n\
+-n            run Now (start shaping without delay - overrides qos-free-delay keyword)\n\
+-l Mmm YYYY   generate HTML summary of traffic Logs (Mmm=Jan-Dec or Year, YYYY=year)\n\
+-m            generate HTML summary of traffic logs for yesterday's Month\n\
+-y            generate HTML summary of traffic logs for yesterday's Year\n");
 /* not yet implemented:
 -s            start shaping! (keep data transfer statistics - but apply shaping)\n\
--r            just reload configuration (...and keep data transfer statistics)\n\
 */
 }
 
 /* === Configuraration file values defaults - stored in global variables ==== */
 
-int filter_type=1;                      /*1 mark, 2 classify*/
-char *mark="MARK";
-char *mark_iptables="MARK --set-mark ";
-int dry_run=0;                         /* preview - use puts() instead of system() */
-char *iptablespreamble="*mangle\n:PREROUTING ACCEPT [0:0]\n:POSTROUTING ACCEPT [0:0]\n:INPUT ACCEPT [0:0]\n:OUTPUT ACCEPT [0:0]\n:FORWARD ACCEPT [0:0]";
-FILE *iptables_file=NULL;
-int enable_credit=1;                   /* enable credit file */
-int use_credit=0;                      /* use credit file (if enabled)*/
-char *title="Hall of Fame - Greatest Suckers"; /* hall of fame title */
-int hall_of_fame=1;		               /* enable hall of fame */
-char *lan="eth0";                /* LAN interface */
-char *lan_medium="100Mbit";      /* 10Mbit/100Mbit ethernet */
-char *wan="eth1";                /* WAN/ISP interface */
-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 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 */
-long long int line=1024;  /* WAN/ISP download in kbps */
-long long int up=1024;    /* WAN/ISP upload in kbps */
-int free_min=32;          /* minimum guaranted bandwidth for all undefined hosts */
-int free_max=64;          /* maximum allowed bandwidth for all undefined hosts */
-int qos_free_delay=0;	  /* seconds to sleep before applying new QoS rules */
-int digital_divide=2;     /* controls digital divide weirdness ratio, 1...3 */ 
-int max_nesting=3;	  /* maximum nesting of HTB clases, built-in maximum seems to be 4 */
-int htb_r2q=1;      
-int burst=8;		  /* HTB burst (in kbits) */
-int burst_main=64;
-int burst_group=32;
-int magic_priorities=8;	  /* number of priority levels (soft shaping) */
-int magic_treshold=8;     /* reduce ceil by X*magic_treshhold kbps (hard shaping) */
-int keywordcount=0;
-
+int        filter_type = 1; /*1 mark, 2 classify*/
+char             *mark = "MARK";
+char    *mark_iptables = "MARK --set-mark ";
+int            dry_run = 0; /* preview - use puts() instead of system() */
+char *iptablespreamble = "*mangle\n:PREROUTING ACCEPT [0:0]\n:POSTROUTING ACCEPT [0:0]\n:INPUT ACCEPT [0:0]\n:OUTPUT ACCEPT [0:0]\n:FORWARD ACCEPT [0:0]";
+FILE    *iptables_file = NULL;
+int      enable_credit = 1; /* enable credit file */
+int         use_credit = 0; /* use credit file (if enabled)*/
+char            *title = "Hall of Fame - Greatest Suckers"; /* hall of fame title */
+int       hall_of_fame = 1; /* enable hall of fame */
+char              *lan = "eth0"; /* LAN interface */
+char       *lan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */
+char              *wan = "eth1"; /* WAN/ISP interface */
+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 */
+long long int     line = 1024; /* WAN/ISP download in kbps */
+long long int       up = 1024; /* WAN/ISP upload in kbps */
+int           free_min = 32; /* minimum guaranted bandwidth for all undefined hosts */
+int           free_max = 64; /* maximum allowed bandwidth for all undefined hosts */
+int     qos_free_delay = 0; /* seconds to sleep before applying new QoS rules */
+int     digital_divide = 2; /* controls digital divide weirdness ratio, 1...3 */ 
+int        max_nesting = 3; /* maximum nesting of HTB clases, built-in maximum seems to be 4 */
+int            htb_r2q = 256; /* should work for leaf values 512 kbps to 8 Mbps */
+int              burst = 8; /* HTB burst (in kbits) */
+int         burst_main = 64;
+int        burst_group = 32;
+int     magic_treshold = 8; /* reduce ceil by X*magic_treshhold kbps (hard shaping) */
+int       keywordcount = 0;
 /* not yet implemented:
- int fixed_packets=0;	maximum number of pps per IP address (not class!) 
- int packet_limit=5;   maximum number of pps to htn CEIL, not rate !!! 
+int      fixed_packets = 0; maximum number of pps per IP address (not class!) 
+int       packet_limit = 5; maximum number of pps to htn CEIL, not rate !!! 
 */
-FILE *log_file=NULL;
-
-char *kwd="via-prometheus";           /* /etc/hosts comment, eg. #qos-64-128 */
+FILE         *log_file = NULL;
+char              *kwd = "via-prometheus"; /* /etc/hosts comment, eg. #qos-64-128 */
 
-const int idxtable_treshold1=24;      /* this is no longer configurable */
-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 */
+const int highest_priority   = 0; /* highest HTB priority (HTB built-in value is 0) */
+const int lowest_priority    = 7; /* lowest HTB priority (HTB built-in value is 7) */
+const int idxtable_treshold1 = 24;      /* this is no longer configurable */
+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 +150,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 +188,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 +208,24 @@ struct Keyword
 void TheIP(void)
 {
  create(ip,IP);
- ip->name="";
- ip->addr="";
- ip->sharing=NULL;
- ip->prio=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);
 }
 
@@ -229,10 +241,14 @@ char *very_ugly_ipv4_code(char *inip,int bitmask,int format_as_chainname)
  /* 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,9 +257,13 @@ 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++;
    }
@@ -284,10 +304,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 =================== */
 
@@ -314,16 +338,12 @@ void get_config(char *config_filename)
    keyword->asymetry_ratio=1;          /* ratio for ADSL-like upload */
    keyword->asymetry_fixed=0;          /* fixed treshold for ADSL-like upload */
    keyword->data_limit=8;              /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */
-   keyword->data_prio=4;              /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */
+   keyword->data_prio=4;               /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */
    keyword->fixed_limit=0;             /* fixed data limit for setting lower HTB ceil */
    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=1;
+   keyword->default_prio=highest_priority+1;
    keyword->html_color="000000";
    keyword->ip_count=0;
    keyword->leaf_discipline="";
@@ -334,36 +354,36 @@ void get_config(char *config_filename)
    
    kwd=NULL;
   }
-  else every(keyword,keywords)
+  else
   {
-   int l=strlen(keyword->key);
-
+    for_each(keyword,keywords)
+    {
+     int l=strlen(keyword->key);
 
-   if(!strncmp(keyword->key,_,l) && strlen(_)>l+2)
-   {
-    char *tmptr=_; /*  <---- l+1 ----> */
-    _+=l+1;        /*  via-prometheus-asymetry-ratio, etc. */
-    ioption("asymetry-ratio",keyword->asymetry_ratio);
-    ioption("asymetry-treshold",keyword->asymetry_fixed);
-    ioption("magic-relative-limit",keyword->data_limit);
-    ioption("magic-relative-prio",keyword->data_prio);
-    loption("magic-fixed-limit",keyword->fixed_limit);
-    loption("magic-fixed-prio",keyword->fixed_prio);
-    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;        
-   }
+     if(!strncmp(keyword->key,_,l) && strlen(_)>l+2)
+     {
+      char *tmptr=_; /*  <---- l+1 ----> */
+      _+=l+1;        /*  via-prometheus-asymetry-ratio, etc. */
+      ioption("asymetry-ratio",keyword->asymetry_ratio);
+      ioption("asymetry-treshold",keyword->asymetry_fixed);
+      ioption("magic-relative-limit",keyword->data_limit);
+      ioption("magic-relative-prio",keyword->data_prio);
+      loption("magic-fixed-limit",keyword->fixed_limit);
+      loption("magic-fixed-prio",keyword->fixed_prio);
+      ioption("htb-default-prio",keyword->default_prio);
+      ioption("htb-rate-bonus",keyword->reserve_min);
+      ioption("htb-ceil-malus",keyword->reserve_max);
+      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;        
+      }
+     }
+    }
   }
 
   option("tc",tc);
@@ -402,7 +422,6 @@ void get_config(char *config_filename)
   ioption("htb-nesting-limit",max_nesting);
   ioption("htb-r2q",htb_r2q);
   ioption("magic-include-upload",include_upload);
-  ioption("magic-priorities",magic_priorities);
   ioption("magic-treshold",magic_treshold);  
   option("filter-type", cnf);
   
@@ -420,21 +439,25 @@ void get_config(char *config_filename)
  printf("\n");
  
  /*leaf discipline for keywords*/
- every(keyword,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 ?*/
@@ -466,7 +489,7 @@ void get_traffic_statistics(void)
   append(line,lines);
  }
 
- every(line,lines)
+ for_each(line,lines)
  {
   int col, accept=0,proxyflag=0,valid=1,setchainname=0,commonflag=0; 
   unsigned long long traffic=0;
@@ -514,10 +537,17 @@ void get_traffic_statistics(void)
   
     if(accept && traffic>0 && ipaddr)
     {
-     if(proxyflag)printf("(proxy) ");
-     else if(!downloadflag) printf("(upload) ");
+     if(proxyflag)
+     {
+      printf("(proxy) ");
+     }
+     else if(!downloadflag)
+     {
+      printf("(upload) ");
+     }
      printf("IP %s: %Lu M (%ld pkts)\n", ipaddr, traffic, pkts);
-     find(ip,ips,eq(ip->addr,ipaddr)); 
+
+     if_exists(ip,ips,eq(ip->addr,ipaddr)); 
      else 
      {
       TheIP();
@@ -533,9 +563,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;
      }
@@ -544,15 +578,20 @@ 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);
 }
  
@@ -560,8 +599,18 @@ void get_traffic_statistics(void)
 
 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)
@@ -571,7 +620,7 @@ void save_line(char *line)
 
 void run_restore(void)
 {
- char *restor, *str;
+ char *restor;
  string(restor,STRLEN);
 
  /*-----------------------------------------------------------------*/
@@ -582,11 +631,11 @@ void run_restore(void)
  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);
@@ -599,24 +648,51 @@ 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;
 
- find(ip,ips,eq(ip->addr,ipaddr)); else TheIP();
+ if_exists(ip,ips,eq(ip->addr,ipaddr));
+ else
+ {
+  TheIP();
+ }
  ip->addr=ipaddr;
  ip->name=ipname;
+ if(lmsid)
+ {
+  ip->lmsid=atoi(lmsid);
+  found_lmsid=1;
+ }
 }
 
 char *parse_datafile_line(char *str)
@@ -630,133 +706,232 @@ char *parse_datafile_line(char *str)
   return ptr;
  } 
  else 
+ {
   return NULL;
+ }
 }
 
 struct IpLog
 {
  char *name;
  long traffic;
+ long guaranted;
+ int i;
+ int lmsid;
+ long l;
  list(IpLog);
 } *iplog,*iplogs;
 
 void parse_ip_log(int argc, char **argv) 
 {
- char *month,*year,*str,*name,*ptr,*ptr2;
- long traffic,traffic_month,total=0;
- int col,col2,y_ok,m_ok,accept_month,i=1,any_month=0;
- char mstr[4],ystr[5];
- FILE *f;
- 
+ 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, lmsid;
+ char mstr[4], ystr[5];
+ FILE *f; 
  string(str,STRLEN);
+ string(filename,STRLEN);
 
  if(argv[1][1]=='l') /* -l */
  {
-   if(argc<4)
-   {
-    puts("Missing parameter(s)!\nUsage: prometheus -l Mmm YYYY (Mmm=Jan-Dec or Year, YYYY=year)");
-    exit(-1);
-   }
-   else
-   {
-    month=argv[2];
-    if(eq(month,"Year")) any_month=1;
-    year=argv[3];
-   }
+  if(argc<4)
+  {
+   puts("Missing parameter(s)!\nUsage: prometheus -l Mmm YYYY (Mmm=Jan-Dec or Year, YYYY=year)");
+   exit(-1);
+  }
+  else
+  {
+   month=argv[2];
+   if(eq(month,"Year")) any_month=1;
+   year=argv[3];
+  }
  }
  else
  { 
-   time_t t = time(NULL) - 3600*24 ; /* yesterday's timestamp*/
-   struct tm *timep = localtime(&t);                                           
- 
-   if(argv[1][1]=='m') /* -m yestarday - month */
-   {
-    strftime(mstr, 4, "%b", timep);
-    month=mstr;
-    strftime(ystr, 5, "%Y", timep);
-    year=ystr; 
-   }
-   else /* -y yesterday - year */
-   {
-    month="Year";
-    any_month=1;
-    strftime(ystr, 5, "%Y", timep);
-    year=ystr;
-   }
+  time_t t = time(NULL) - 3600*24 ; /* yesterday's timestamp*/
+  struct tm *timep = localtime(&t);                                           
+
+  if(argv[1][1]=='m') /* -m yestarday - month */
+  {
+   strftime(mstr, 4, "%b", timep);
+   month=mstr;
+   strftime(ystr, 5, "%Y", timep);
+   year=ystr; 
+  }
+  else /* -y yesterday - year */
+  {
+   month="Year";
+   any_month=1;
+   strftime(ystr, 5, "%Y", timep);
+   year=ystr;
+  }
  }
  printf("Analysing traffic for %s %s ...\n",month,year);
 
- sprintf(str,"%s %s/*.log",ls,log_dir);
+ /* sorry... next release of C<<1 header file will include for_path_files(name,path) {  } macro */
+ sprintf(str,"%s %s/",ls,log_dir);
  shell(str);
-
- input(str,STRLEN)
+ input(str,STRLEN) 
  {
-  ptr=strrchr(str,'\n');
-  if(ptr) *ptr='\0';
-  printf("Parsing %s ...",str);
-  accept_month=0;
-  traffic_month=0;
-  parse(str)
+  if(strstr(str,".log"))
   {
-   y_ok=m_ok=0;  
-   valid_columns(ptr,_,'\t',col) switch(col)
-   {
-    case 2: name=ptr;break;
-    case 3: traffic=atol(ptr);break;
-    /* column number   - was 7, now 9...*/
-    case 7:
-    case 8:
-    case 9: if (isalnum(*ptr)) /* alphanumeric string = date, just one*/
-            {
-              valid_columns(ptr2,ptr,' ',col2) switch(col2)
-              {
-               case 2: if(any_month || eq(ptr2,month)) m_ok=1; break;
-               case 5: if(eq(ptr2,year)) y_ok=1; break;
-              }
-            }
-   }
-   
-   if(y_ok && m_ok) 
-   {
-    traffic_month+=traffic;
-    accept_month=1;
-   }
-  }
-  done;
+    ptr=strrchr(str,'\n');
+    if(ptr) *ptr='\0';
+    sprintf(filename,"%s/%s",log_dir,str);
+    printf("Parsing %s ...",filename);
+    accept_month=0;
+    traffic_month=0;
+    guaranted=0;
+    lmsid=-1;
+    parse(filename)
+    {
+     y_ok=m_ok=0;  
+     valid_columns(ptr,_,'\t',col) switch(col)
+     {
+      case 2: name = ptr;break;
+      case 3: traffic = atol(ptr);break;
+      /* column number   - was 7, now 11...*/
+      case 7:
+      case 8:
+      case 9:
+      case 10:
+      case 11: if (isalpha(*ptr)) /* character, not numeric string = date, just one*/
+               {
+                valid_columns(ptr2,ptr,' ',col2) switch(col2)
+                {
+                 case 2: if(any_month || eq(ptr2,month)) m_ok = 1; break;
+                 case 5: if(eq(ptr2,year)) y_ok = 1; break;
+                }
+               }
+               else
+               {
+                 if(col == 7) guaranted = atol(ptr);
+                 if(col == 10) lmsid = atoi(ptr);
+               }
+     }
+     
+     if(y_ok && m_ok) 
+     {
+      traffic_month += traffic;
+      accept_month = 1;
+     }
+    }
+    done;
 
-  if(accept_month)
-  {
-   create(iplog,IpLog);
-   iplog->name=name;
-   iplog->traffic=traffic_month;
-   insert(iplog,iplogs,desc_order_by,traffic);
-   printf(" %ld MB\n",iplog->traffic);
+    if(accept_month)
+    {
+     create(iplog,IpLog);
+     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);
+    }
+    else
+    {
+     puts(" no records.");
+    }
   }
-  else
-   puts(" no records.");
  }
  sprintf(str,"%s/%s-%s.html",html_log_dir,year,month);
  printf("Writing %s ...",str);
  f=fopen(str,"w");
  if(f)
  {
-  fprintf(f,"<table border><tr><th colspan=\"4\">Data transfers - %s %s</th></tr>\n ",month,year);
-  every(iplog,iplogs)
+  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 ",month,year);
+
+  for_each(iplog,iplogs)
+  {
    if(iplog->traffic)
    {
-    fprintf(f,"<tr><td align=\"right\">%d</td><th>%s</td><td align=\"right\">%ld MB</td><th align=\"right\">%ld GB</th></tr>\n",i++,iplog->name,iplog->traffic,iplog->traffic>>10);
+    fprintf(f,"<tr><td align=\"right\">%d</td><th align=\"left\">%s</td><td align=\"right\">", i++, iplog->name); 
+    if(iplog->lmsid > 0)
+    {
+     /*base URL will be configurable soon ... */
+     fprintf(f,"<a href=\"https://hermes.spoje.net/?m=customerinfo&amp;id=%d\">%04d</a>\n", iplog->lmsid, iplog->lmsid);
+    }
+    else if(iplog->lmsid == 0)
+    {
+     fputs("-------",f);
+    }    
+    fprintf(f,"<td align=\"right\">%ld M</td><th align=\"right\">%ld G</th><td align=\"right\">%ld kbps</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);
+
+  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);
+
+   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));
+   }
+   
+   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));
+   }
+
+   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));
+   }
+
+   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));
+   }
+
+   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));
+   }
+
+   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,"<tr><th colspan=\"3\" align=\"left\">Total:</th><th align=\"right\">%ld GB</th></tr>\n",total);
-  fputs("</table>\n",f);
+
+   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));
+   }
+
+   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,"<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, stats_html_signature, version);
   fclose(f);
   puts(" done.");
  }
 }
 
-
 /*-----------------------------------------------------------------*/
-/* Are you looking for int main (int argc, char **argv) ? :-))     */
+/* Are you looking for int main(int argc, char **argv) ? :-))      */
 /*-----------------------------------------------------------------*/
 
 program
@@ -767,18 +942,20 @@ program
  char *substring;
  int class_count=0,ip_count=0;
  int parent=1;
- int just_flush=0;
- int nodelay=0;
- int just_preview=0;                /* preview - generate just stats */
- int just_logs=0;                   /* just parse logs */
+ int just_flush=FALSE;
+ int nodelay=FALSE;
+ 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\
-iptables-restore & burst tunning & classify modification 0.7d by Ludva\n\
+Version %s - Copyright (C)2005-2011 Michael Polak (xChaos)\n\
+iptables-restore & burst tunning & classify modification by Ludva\n\
 Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
  /*----- Boring... we have to check command line options first: ----*/
@@ -787,24 +964,27 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  {
   argument("-c") { nextargument(config); }
   argument("-h") { nextargument(althosts);}
-  argument("-d") { dry_run=1; }
-  argument("-f") { just_flush=1; }
-  argument("-9") { just_flush=9; }
-  argument("-p") { just_preview=1; }
-  argument("-n") { nodelay=1; }
-  argument("-l") { just_logs=1; }
-  argument("-m") { just_logs=1; }
-  argument("-y") { just_logs=1; }
+  argument("-d") { run=TRUE; dry_run=TRUE; }
+  argument("-f") { run=TRUE; just_flush=TRUE; }
+  argument("-9") { run=TRUE; just_flush=9; }
+  argument("-p") { run=TRUE; just_preview=TRUE; }
+  argument("-r") { run=TRUE; }
+  argument("-n") { run=TRUE; nodelay=TRUE; }
+  argument("-l") { just_logs=TRUE; }
+  argument("-m") { just_logs=TRUE; }
+  argument("-y") { just_logs=TRUE; }
   argument("-?") { help(); exit(0); }
   argument("--help") { help(); exit(0); }
   argument("-v") { exit(0); } 
   argument("--version") { exit(0); } 
  }
-
+ 
  if(dry_run)
+ {
   puts("*** THIS IS JUST DRY RUN ! ***\n");
+ }
 
- date(d); /* this is typical cll1.h macro */
+ date(d); /* this is typical cll1.h macro - prints current date */
 
  /*-----------------------------------------------------------------*/
  printf("Parsing configuration file %s ...\n", config);
@@ -813,11 +993,19 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  
  if(just_logs)
  {
-    parse_ip_log(argc,argv);
-    exit(0);
+  parse_ip_log(argc,argv);
+  exit(0);
+ }
+ else if(not run)
+ {
+  help();
+  exit(0);
  }
 
- if(althosts) hosts=althosts;
+ if(althosts)
+ {
+  hosts=althosts;
+ }
 
  if(just_flush<9)
  {
@@ -836,7 +1024,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-");
@@ -848,14 +1039,16 @@ 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
   {
    //Do we have to create new QoS class for this IP ?
 
-   find(keyword,keywords,(substring=strstr(str,keyword->key)))
+   if_exists(keyword,keywords,(substring=strstr(str,keyword->key)))
    {
     parse_ip(str);
     ip_count++;
@@ -865,7 +1058,9 @@ 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;
@@ -885,19 +1080,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     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;
-*/
      if(ip->max<ip->min)
+     {
       ip->max=ip->min;
+     }
     }
     ip->mark=FIRSTIPCLASS+1+class_count++;
 
-    find(group,groups,group->min==ip->min) 
+    if_exists(group,groups,group->min==ip->min) 
     { 
      group->count++;      
      group->desired+=ip->min;
@@ -937,17 +1127,20 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  /*-----------------------------------------------------------------*/
  puts("Resolving shared connections ...");
  /*-----------------------------------------------------------------*/
- search(ip,ips,ip->sharing)
+ for_selected(ip,ips,ip->sharing)
  {
-  search(sharedip,ips,eq(sharedip->name,ip->sharing))
+  for_selected(sharedip,ips,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);
+  }
  }
 
  if(enable_credit && just_flush<9)
@@ -960,8 +1153,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    ptr=parse_datafile_line(_);
    if(ptr)
    {
-    find(ip,ips,eq(ip->addr,_))
+    if_exists(ip,ips,eq(ip->addr,_))
+    {
      sscanf(ptr,"%Lu",&(ip->credit));
+    }
    }
   }
   done;
@@ -974,13 +1169,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);
   }
@@ -1017,7 +1214,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);
@@ -1034,11 +1233,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    save_line(":post_common - [0:0]");
    save_line(":forw_common - [0:0]");
 
-   search(ip,ips,ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0"))
+   for_selected(ip,ips,ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0"))
    {
     buf=hash_id(ip->addr,bitmask);
-    find(idx,idxs,eq(idx->id,buf))
+    if_exists(idx,idxs,eq(idx->id,buf))
+    {
      idx->children++;
+    }
     else
     {
      create(idx,Index);
@@ -1057,11 +1258,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    {
     bitmask-=idxtable_bitmask2;
     idxcount=0;
-    search(idx,idxs,idx->parent==NULL)
+
+    for_selected(idx,idxs,idx->parent==NULL)
     {
      buf=hash_id(idx->addr,bitmask);
-     find(metaindex,idxs,eq(metaindex->id,buf))
-      metaindex->children++;     
+     if_exists(metaindex,idxs,eq(metaindex->id,buf))
+     {
+      metaindex->children++;
+     }
      else
      {
       create(metaindex,Index);
@@ -1082,7 +1286,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    sort(idx,idxs,order_by,bitmask);
 
    i=0;
-   every(idx,idxs)
+   for_each(idx,idxs)
    {
     subnet=subnet_id(idx->addr,idx->bitmask);
     printf("%d: %s/%d\n",++i,subnet,idx->bitmask);
@@ -1099,7 +1303,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);
@@ -1113,7 +1319,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);
@@ -1151,27 +1359,30 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   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 0",tc,lan,lan_medium,lan_medium,burst_main);
+  sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d",
+               tc,lan,lan_medium,lan_medium,burst_main,highest_priority);
   safe_run(str);
 
-  sprintf(str,"%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio 0",tc,lan,line,line,burst_main);
+  sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d",
+                tc,lan,line,line,burst_main,highest_priority);
   safe_run(str);
 
   sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",tc,wan,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 0",tc,wan,wan_medium,wan_medium,burst_main);
+  sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d",
+               tc,wan,wan_medium,wan_medium,burst_main,highest_priority);
   safe_run(str);
 
-  sprintf(str,"%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio 0",tc,wan,up,up,burst_main);
+  sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d",
+               tc,wan,up,up,burst_main,highest_priority);
   safe_run(str);
  }
 
  /*-----------------------------------------------------------------*/
- puts("Locating suckers and generating root classes ...");
+ 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 */  
@@ -1181,44 +1392,58 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   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");
+  }
     
-  every(group,groups)
+  for_each(group,groups)
   {
    if(!just_preview)
    {
-    
     //download
-    sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio 1 #down desired %d", 
-                 tc, lan, parent, group->id, rate, max, burst_group, group->desired);
+    sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d #down desired %d", 
+                 tc, lan, parent, group->id, rate, max, burst_group, highest_priority+1, group->desired);
     safe_run(str);
     
     //upload
-    sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio 1 #up desired %d", 
-                 tc, wan, parent, group->id, rate*up/line, max*up/line, burst_group, group->desired);
+    sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d #up desired %d", 
+                 tc, wan, parent, group->id, rate*up/line, max*up/line, burst_group, highest_priority+1, group->desired);
     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;
+   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=magic_priorities+1;
+    int group_rate=group->min, priority_sequence=lowest_priority;
     
-    search(ip, ips, ip->min==group->min && ip->max>ip->min)
+    for_selected(ip, ips, 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(group_rate<ip->max) ip->max=group_rate;
+      if(group_rate<ip->max)
+      {
+       ip->max=group_rate;
+      }
       group_rate+=magic_treshold;
-      ip->prio=magic_priorities+2;
-      if(ip->prio<3) ip->prio=3;
+      ip->prio=lowest_priority;
+      if(ip->prio<highest_priority+2)
+      {
+       ip->prio=highest_priority+2;
+      }
      }
      else
      {
@@ -1227,15 +1452,20 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
            (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20)) )
       {
        ip->prio=priority_sequence--;
-       if(ip->prio<2) ip->prio=2;
+       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);
       }
      }
@@ -1243,7 +1473,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
         
    }
   }
-  if(credit_file)fclose(credit_file);
+  if(credit_file)
+  {
+   fclose(credit_file);
+  }
  }
 
  if(just_preview)
@@ -1259,7 +1492,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   f=fopen("/var/run/prometheus.previous","w");
   if(f)
   {
-   search(ip,ips,ip->traffic || ip->direct || ip->proxy ||ip->upload)
+   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);
    fclose(f);
   }
@@ -1270,7 +1503,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
  if(f)
  {
-  int total=0;
+
   int count=1;
   i=0;
 
@@ -1281,7 +1514,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   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);
-  every(group,groups) 
+
+  for_each(group,groups) 
   { 
 #ifdef DEBUG
    printf("%d k group: %d bandwidth requested: %d k\n",group->min,group->count,group->desired);
@@ -1289,9 +1523,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    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);
 
-   every(keyword,keywords)
-    fprintf(f,"<td align=\"right\"><font color=\"#%s\">%d M</font></td>",keyword->html_color,group->min*keyword->data_limit); 
-   
+   for_each(keyword,keywords)
+   {
+    fprintf(f,"<td align=\"right\"><font color=\"#%s\">%d M</font></td>",keyword->html_color,group->min*keyword->data_limit);
+   }   
    i+=group->desired; 
    total+=group->count;
    count++; 
@@ -1302,9 +1537,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    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);
 
-   every(keyword,keywords)
-    fprintf(f,"<th align=\"right\">%d IPs</th>",keyword->ip_count); 
-
+   for_each(keyword,keywords)
+   {
+    fprintf(f,"<th 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);
 
@@ -1316,33 +1552,44 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  i=1;
  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;
   struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums=NULL;
 
+  colspan=11;
   if(qos_proxy)
-   colspan=12;
-  else 
-   colspan=11;
+  {
+   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>\
-  <td align=\"right\">credit</td>\
-  <td align=\"right\">limit</td>\
-  <td align=\"right\">total</td>\
-  <td align=\"right\">direct</td>\n",f);
+  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);
   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);	
+<td align=\"right\">minimum</td>\
+<td align=\"right\">desired</td>\
+<td align=\"right\">maximum</td>\
+<td>prio</td></tr>\n",f);	
 
-  every(ip,ips)
+  for_each(ip,ips)
   {
    char *f1="", *f2="";
    if(ip->max<ip->desired)
@@ -1350,7 +1597,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     f1="<font color=\"red\">";
     f2="</font>";
    }
-   else if(ip->prio>1)
+   else if(ip->prio>highest_priority+1)
    {
     f1="<font color=\"brown\">";
     f2="</font>";
@@ -1359,15 +1606,33 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 #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,"<tr><td align=\"right\"><a name=\"%s\"></a>%d</td><td><a href=\"%s%s.log\">%s</a></td>\n", ip->name, i, log_url, ip->name, ip->name);
+   if(found_lmsid)
+   {
+    fputs("<td align=\"right\">",f);
+    if(ip->lmsid > 0)
+    {
+     /*base URL will be configurable soon ... */
+     fprintf(f,"<a href=\"https://hermes.spoje.net/?m=customerinfo&amp;id=%d\">%04d</a>\n", ip->lmsid, ip->lmsid);
+    }
+    else if(ip->lmsid == 0)
+    {
+     fputs("-------",f);
+    }
+    fputs("</td>\n",f);    
+   }
+   fprintf(f,"<td align=\"right\">%Lu M</td>\n", 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);
    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 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_traffic+=ip->traffic;
    total_direct+=ip->direct;
    total_proxy+=ip->proxy;
    total_upload+=ip->upload;
@@ -1389,80 +1654,103 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     iplog=fopen(str,"a");
     if(iplog)
     {
-     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*/
+     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);
     }
    }
-
   }
-  fprintf(f,"<tr><th colspan=\"4 \"align=\"left\">SUMMARY:</td>");
+  fprintf(f,"<tr><th colspan=\"%d\" align=\"left\">SUMMARY:</td>",colspan-7);
   fprintf(f,"<th align=\"right\">%Lu M</th>\
-  <th align=\"right\">%Lu M</th>\n", total, total_direct);
+  <th align=\"right\">%Lu M</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);
 
   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);
+   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);
 
-   find(sum,sums,sum->l>=total/4)
+   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,"<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);
    }
    
-   find(sum,sums,sum->i==10)
+   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,"<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);
    }
 
-   find(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,"<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);
    }
 
-   find(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,"<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);
    }
 
-   find (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);
+    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);
    }
 
-   find(sum,sums,sum->i>=(active_classes+1)/4)
+   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,"<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);
    }
 
-   find(sum,sums,sum->i>=(active_classes+1)/2)
+   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,"<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);
    }
 
-   find(sum,sums,sum->i>=4*(active_classes+1)/5)
+   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,"<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,"<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,"<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);
+
+   /* write basic ERP data to log directory */
+   if(!just_preview)
+   {
+    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 %%\t%d\t%Lu M\t%d\t%s",
+                    time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, active_classes, total_traffic, total, d); /* d = date*/
+     fclose(iplog);
+    }
+   }
   }
-  fprintf(f,"<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",version);
+
+  fprintf(f, stats_html_signature, version);
   fclose(f);
  }
 
@@ -1478,7 +1766,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
  i=0;
  printf("%-22s %-15s mark\n","name","ip");
- search(ip,ips,ip->mark>0)
+
+ for_selected(ip,ips,ip->mark>0)
  { 
   
   if(idxs)
@@ -1538,14 +1827,15 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    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")){
-    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){
-    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);
+   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*/
+     safe_run(str);
+   }   
+   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);
+     safe_run(str);
    }
 
    /* -------------------------------------------------------- upload class */
@@ -1558,14 +1848,15 @@ 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")){
-    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){
-    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 (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*/
+     safe_run(str);
+   }   
+   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);
+     safe_run(str);
    }
   }
   else
@@ -1573,72 +1864,78 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   i++;
  }
 
-
  if(idxs)
  {
-  chain_forward="forw_common";
-  chain_postrouting="post_common";
+   chain_forward = "forw_common";
+   chain_postrouting = "post_common";
  }
  else
  {
-  chain_forward="FORWARD";
-  chain_postrouting="POSTROUTING";
+   chain_forward = "FORWARD";
+   chain_postrouting = "POSTROUTING";
  }
-
- /* --------------------------------------------------------  mark download */
-
- if(qos_proxy)
+ /* -------------------------------- classify or reject free download */
  {
-  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 ACCEPT",chain_postrouting,proxy_ip,proxy_port,lan);
-  save_line(str);
+   char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */
+   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);
+       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);
+     save_line(str);
+   }
+   if(free_min)
+   {
+     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);
+   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);
+     save_line(str);
+   }
+   sprintf(str,"-A %s -o %s -j %s",chain_forward,wan,final_chain);
+   save_line(str);
  }
- 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 ACCEPT",chain_postrouting,lan);
- save_line(str);
-
- /* --------------------------------------------------------  mark upload */
- 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 ACCEPT",chain_forward,wan);
- save_line(str);
-
- printf("Total IP count: %d\n", i);
-
- /*-----------------------------------------------------------------*/
- puts("Generating free bandwith classes ...");
- /*-----------------------------------------------------------------*/
 
- /* ---------------------------------------- tc - free bandwith shared class */
- sprintf(str,"%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio 2",tc,lan,parent,free_min,free_max,burst);
- safe_run(str);
-
- sprintf(str,"%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio 2",tc,wan,parent,free_min,free_max,burst);
- safe_run(str);
+ if(free_min) /* allocate free bandwith if it is not zero... */ 
+ {
+   /*-----------------------------------------------------------------*/
+   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);
+   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);
+   safe_run(str);
+   /* tc SFQ */
+   if (strcmpi(qos_leaf, "none"))
+   {
+     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);
+     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);
+   safe_run(str);
 
- /* tc SFQ */
- if (strcmpi(qos_leaf, "none")){
-  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);
-  safe_run(str);
+   sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,wan);
+   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);
- safe_run(str);
-
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,wan);
- safe_run(str);
-
- run_restore();
- 
+ printf("Total IP count: %d\n", i);
+ run_restore(); 
  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... */
 }