X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=045c182bfca6b686a97cf7aab9db2ebd5ffff791;hp=561e2bde85664d5afeb6bd525ac64a0af66a65f8;hb=af37be1dccdd5c9b86113a6e02ed794da3102ec4;hpb=6cc38f967cc2361d731be391b12a22862e708aaf

diff --git a/prometheus.c b/prometheus.c
index 561e2bd..045c182 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -1,13 +1,13 @@
-  /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
- /*     Prometheus QoS - you can "steal fire" from your ISP     */
-/*      "fair-per-IP" quality of service (QoS) utility          */
-/*      requires Linux 2.4.x or 2.6.x with HTB support          */
-/*      Copyright(C) 2005-2008 Michael Polak (xChaos)           */
-/*    iptables-restore support Copyright(C) 2007-2008 ludva     */
-/*  Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
-
-/* Modified by: xChaos, 20111130
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+/* Prometheus QoS - you can "steal fire" from your ISP         */
+/* "fair-per-IP" quality of service (QoS) utility              */
+/* requires Linux 2.4.x or 2.6.x with HTB support              */
+/* Copyright(C) 2005-2013 Michael Polak, Arachne Aerospace     */
+/* iptables-restore support Copyright(C) 2007-2008 ludva       */
+/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+/* Modified by: xChaos, 20130124
                  ludva, 20080415
  
    Prometheus QoS is free software; you can redistribute it and/or
@@ -26,97 +26,87 @@
    
    GNU General Public License is located in file COPYING */
 
-#define STRLEN 256
-#define FIRSTGROUPID 1024
-#define FIRSTIPCLASS 2048
-#undef DEBUG
-
 #include "cll1-0.6.2.h"
+#include "ipstruct.h"
 
-const char *version = "0.8.3-b";
+const char *version = "0.8.3-i";
 
-/* 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. */
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+/* Versions: 0.8.3 is development release, 0.8.4 will be "stable"  */
+/* Official Trac URL: https://dev.arachne.cz/svn/prometheus        */
+/* Official SVN URL: https://dev.arachne.cz/repos/prometheus       */
+/* BTC donations account: 19rriLx8vR19wGefPaMhakqnCYNYwjLvxq       */
+/* CZK donations account: 2900242944/2010 (transparent account)    */
+/* Warning: unofficial Github mirror is not supported by author!  */
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-const char *stats_html_signature = "<small>Statistics generated by Prometheus QoS version %s<br>GPL+Copyright(C)2005-2011 Michael Polak, <a href=\"http://www.arachne.cz/\">Arachne Labs</a></small>\n";
+const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2013 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";
+
+#define STRLEN 512
+#undef DEBUG
 
 /* ======= 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        *ls = "/bin/ls"; /* this is not user configurable :-) */
+const char               *tc = "/sbin/tc"; /* requires tc with HTB support */
+const char         *iptables = "/sbin/iptables"; /* requires iptables utility */
+const char        *ip6tables = "/sbin/ip6tables"; /* requires iptables utility */
+const char     *iptablessave = "/sbin/iptables-save"; /* not yet required */
+const char  *iptablesrestore = "/sbin/iptables-restore";  /* requires iptables-restore */
+const char    *ip6tablessave = "/sbin/ip6tables-save"; /* not yet required */
+const char *ip6tablesrestore = "/sbin/ip6tables-restore";  /* requires iptables-restore */
+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    *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/
+char   *ip6tablesfile = "/var/spool/prometheus.ip6tables"; /* temporary file for ip6tables-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        *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 - html version */
+char    *json_traffic = "/var/www/logs/traffic.json"; /* hall of fame - json version */
+char    *json_preview = "/var/www/logs/preview.json"; /* hall of fame preview - 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;
-
-/* ======= Help screen is hopefuly self-documenting part of code :-) ======= */
-
-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\
--9            emergency iptables flush (do not read data transfer statistics)\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\
-*/
-}
-
+int use_jquery_popups = TRUE;
+int      row_odd_even = 0; /*<tr class="odd/even"> */
+ 
 /* === Configuraration file values defaults - stored in global variables ==== */
 
 int        filter_type = 1; /*1 mark, 2 classify*/
+char      *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */
 char             *mark = "MARK";
 char    *mark_iptables = "MARK --set-mark ";
-int            dry_run = 0; /* preview - use puts() instead of system() */
+int            dry_run = FALSE; /* 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]";
+char      *ip6preamble = "-A FORWARD -p ipv6-icmp -j ACCEPT\n-A POSTROUTING -p ipv6-icmp -j ACCEPT\n-A FORWARD -s fe80::/10 -j ACCEPT\n-A FORWARD -d ff00::/8 -j ACCEPT\n-A POSTROUTING -s fe80::/10 -j ACCEPT\n-A POSTROUTING -d ff00::/8 -j ACCEPT";
 FILE    *iptables_file = NULL;
-int      enable_credit = 1; /* enable credit file */
-int         use_credit = 0; /* use credit file (if enabled)*/
+FILE   *ip6tables_file = NULL;
+int      enable_credit = TRUE; /* enable credit file */
+int         use_credit = FALSE; /* 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 */
+int       hall_of_fame = TRUE; /* enable hall of fame */
 char              *lan = "eth0"; /* LAN interface */
 char       *lan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */
 char              *wan = "eth1"; /* WAN/ISP interface */
+char        *ip6prefix = NULL; /* Prefix for global /48 IPv6 subnet */
 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 */
+int          qos_proxy = TRUE; /* include proxy port to QoS */
+int        found_lmsid = FALSE; /* show links to users in LMS information system */
+int     include_upload = TRUE; /* 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           free_min = 256; /* minimum guaranted bandwidth for all undefined hosts */
+int           free_max = 512; /* 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 */
@@ -126,6 +116,8 @@ int         burst_main = 64;
 int        burst_group = 32;
 int     magic_treshold = 8; /* reduce ceil by X*magic_treshhold kbps (hard shaping) */
 int       keywordcount = 0;
+int        class_count = 0;
+int           ip_count = 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 !!! 
@@ -140,40 +132,47 @@ 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! https://dev.arachne.cz/svn/cll1h ==== */
+struct IP *ips = NULL, *networks = NULL, *ip, *sharedip;
+struct Group *groups = NULL, *group;
+struct Keyword *keyword, *defaultkeyword=NULL, *keywords=NULL;
 
-struct IP
-{
- char *addr;
- char *name;
- char *sharing;
- int min;
- int desired;
- int max;
- int mark;
- int prio;
- int fixedprio;
- int group;
- int lmsid;
- unsigned long long direct;
- unsigned long long proxy;
- unsigned long long upload;
- unsigned long long traffic;
- unsigned long long credit;
- unsigned long pktsup;
- unsigned long pktsdown;
- struct Keyword *keyword;
- list(IP);
-} *ips=NULL, *ip, *sharedip;
-
-struct Group
+void help(void);
+/* implemented in help.c */
+
+void get_traffic_statistics(const char *whichiptables, int ipv6);
+/* implemented in parseiptables.c */
+
+void parse_ip_log(int argc, char **argv);
+/* implemented in parselog.c */
+
+void parse_hosts(char *hosts);
+/* implemented in parsehosts.c */
+
+void write_json_traffic(char *json);
+/* implemented in json.c */
+
+void write_htmlandlogs(char *html, char *d, int total, int just_preview);
+/* implemented in htmlandlogs.c */
+
+void analyse_topology(char *traceroute);
+/* implemented in networks.c */
+
+
+const char *tr_odd_even(void)
 {
- int min;
- int count;
- int desired;
- int id;
- list(Group);
-} *groups=NULL, *group;
+ row_odd_even = 1 - row_odd_even;
+ if(row_odd_even)
+ {
+  return "<tr class=\"even\">\n";
+ }
+ else
+ {
+  return "<tr class=\"odd\">\n";
+ }
+}
+
+/* ==== This is C<<1 stuff - learn C<<1 first! https://dev.arachne.cz/svn/cll1h ==== */
+/* (except that this code uses obsolete, archaic version of this header file...)     */
 
 struct Index
 {
@@ -182,142 +181,26 @@ struct Index
  struct Index *parent;
  int bitmask;
  int children;
+ int ipv6;
  list(Index);
 } *idxs=NULL, *idx, *metaindex;
 
-struct Keyword
-{
- char *key;
- 
- 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 */
- 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) */
- int reserve_max;	    /* malus for nominal HTB ceil (in kbps) */
-// int divide_max;	    /* relative malus: new_ceil=rate+(old_ceil-rate)/divide_max */
-// int htb_ceil_bonus_divide; /* relative bonus: new_ceil=old_ceil+old_ceil/htb_ceil_bonus_divide */
- int default_prio;	    /* default HTB priority for this keyword */
- char *html_color;
- int ip_count;
- char *leaf_discipline;
- 
- list(Keyword);
-} *keyword,*defaultkeyword=NULL,*keywords=NULL;
-
-/* Damned, this must be object oriented! This looks almost like constructor ;-) */
-
-void TheIP(void)
-{
- create(ip,IP);
- 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);
-}
 
 /* ====== iptables indexes are used to reduce complexity to log8(N) ===== */
 
-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;
- char *ip,*outip,*outptr,*fmt;
+char *index_id(char *ip, int bitmask);
+/* function implemented in ipv4subnets.c */
 
- duplicate(inip,ip);
- /* debug printf("(%s,%d) -> ",ip,bitmask); */
+char *subnet_id(char *ip, int bitmask);
+/* function implemented in ipv4subnets.c */
 
- 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)
- {
-  if(*ip=='.')
-  {
-   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';
-    if(format_as_chainname)
-     fmt="_%d_%d";
-    else
-     fmt=".%d";
-    if(bitmask%8)
-     n=atoi(ip+1)-atoi(ip+1)%(1<<(8-bitmask%8));
-    else
-     n=0;
+char *index6_id(char *ip, int bitmask);
+/* function implemented in ipv6subnets.c */
 
-    /*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)
-    {
-     strcat(outip,".0");
-     bitmask+=8;
-    }
-    /* debug printf("[%s]\n",outip); */
-    return outip;
-   }
-  }
-  else 
-  {
-   *outptr=*ip;
-   outptr++;
-  }
-  ip++;
- }
- /*should never exit here*/
- *outptr='\0';
- return outip;
-}
-
-char *hash_id(char *ip,int bitmask)
-{ 
- return very_ugly_ipv4_code(ip,bitmask,1);
-}
-
-char *subnet_id(char *ip,int bitmask)
-{
- return very_ugly_ipv4_code(ip,bitmask,0);
-}
+char *subnet6_id(char *ip, int bitmask);
+/* function implemented in ipv6subnets.c */
 
-/* ================= Let's parse configuration file here =================== */
+/* ================= Let's parse configuration file here ================ */
 
 void reject_config_and_exit(char *filename)
 {
@@ -353,7 +236,10 @@ void get_config(char *config_filename)
    keyword->leaf_discipline="";
 
    push(keyword,keywords);
-   if(!defaultkeyword) defaultkeyword=keyword;
+   if(!defaultkeyword)
+   {
+    defaultkeyword=keyword;
+   }
    keywordcount++;
    
    kwd=NULL;
@@ -392,12 +278,17 @@ void get_config(char *config_filename)
 
   option("tc",tc);
   option("iptables",iptables);
-  option("iptables-save",iptablessave); /* new */
-  option("iptables-restore",iptablesrestore); /* new */
-  option("iptables-file",iptablesfile); /* new */
+  option("iptables-save",iptablessave);
+  option("iptables-restore",iptablesrestore);
+  option("ip6tables",ip6tables);
+  option("ip6tables-save",ip6tablessave);
+  option("ip6tables-restore",ip6tablesrestore);
+  option("iptables-in-filename",iptablesfile);
+  option("ip6tables-in-filename",ip6tablesfile);
   option("hosts",hosts);
   option("lan-interface",lan);
   option("wan-interface",wan);
+  option("ip6-prefix",ip6prefix);
   option("lan-medium",lan_medium);
   option("wan-medium",wan_medium);
   lloption("wan-download",line);
@@ -405,9 +296,12 @@ 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_traffic);
   option("hall-of-fame-preview",preview);
+  option("json-preview",json_preview);
   option("log-filename",cmdlog);
   option("credit-filename",credit);
+  option("classmap-filename",classmap);
   ioption("credit-enable",enable_credit);
   option("log-traffic-directory",log_dir);
   option("log-traffic-html-directory",html_log_dir);
@@ -430,8 +324,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);
@@ -442,19 +335,19 @@ void get_config(char *config_filename)
   perror(config_filename);
   puts("Warning - using built-in defaults instead ...");
  }
- done;
+ done; /* ugly macro end */
  printf("\n");
  
- /*leaf discipline for keywords*/
+ /* leaf discipline for keywords */
  for_each(keyword,keywords)
  {
-    if (!strcmpi(keyword->leaf_discipline, ""))
-    {
-        keyword->leaf_discipline = qos_leaf;
-    }
+  if(!strcmpi(keyword->leaf_discipline, ""))
+  {
+   keyword->leaf_discipline = qos_leaf;
+  }
  }
 
- if (strcmpi(cnf, "mark"))
+ if(strcmpi(cnf, "mark"))
  {
   filter_type = 2;
   mark = "CLASSIFY";
@@ -475,132 +368,6 @@ void get_config(char *config_filename)
  }
 }
 
-/* ===================== traffic analyser - uses iptables  ================ */ 
-
-void get_traffic_statistics(void)
-{
- char *str,*cmd;
- int downloadflag=0;
-
- textfile(Pipe,str) *line,*lines=NULL;
- string(str,STRLEN);
- string(cmd,STRLEN);
-
- sprintf(cmd,"%s -L -v -x -n -t mangle",iptables);
- shell(cmd);
- input(str,STRLEN)
- {
-  create(line,Pipe);
-  line->str=str;
-  string(str,STRLEN);
-  append(line,lines);
- }
-
- for_each(line,lines)
- {
-  int col, accept=0,proxyflag=0,valid=1,setchainname=0,commonflag=0; 
-  unsigned long long traffic=0;
-  unsigned long pkts=0;
-  char *ipaddr=NULL,*ptr;
-  
-  /* debug puts(line->str); */
-  valid_columns(ptr,line->str,' ',col) 
-  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;            
-            else 
-            if(!strncmp(ptr,"forw_",5) || eq(ptr,"FORWARD"))
-             downloadflag=0;
-            
-            if(eq(ptr,"post_common") || eq(ptr,"forw_common"))
-             commonflag=1;
-           }
-           else
-            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");*/
-           break;
-   case 8: if(downloadflag)
-           { 
-            if(strstr(proxy_ip,ptr))proxyflag=1; 
-           }
-           else
-            ipaddr=ptr; 
-            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_exists(ip,ips,eq(ip->addr,ipaddr)); 
-     else 
-     {
-      TheIP();
-      ip->addr=ipaddr;
-      if(eq(ip->addr,"0.0.0.0/0"))
-      {
-       ip->name="(unregistered)";
-       ip->min=free_min;
-       ip->max=ip->desired=free_max;
-      }
-     }
-     
-     if(downloadflag)
-     {
-      if(proxyflag)
-      {
-       ip->proxy=traffic;
-      }
-      else
-      {
-       ip->traffic+=traffic;
-      }
-      ip->direct=ip->traffic-ip->upload-ip->proxy;
-      ip->pktsdown=pkts;
-     }
-     else
-     {
-      ip->upload=traffic;
-      ip->pktsup=pkts;
-      if(include_upload)
-      {
-       ip->traffic+=traffic;
-      }
-      else 
-      {
-       if(traffic>ip->traffic)
-       {
-        ip->traffic=traffic;     
-       }
-      }
-     }
-    }  
-  }
-
- free(cmd);
-}
  
 /* ========== This function executes, logs OR ALSO prints command ========== */
 
@@ -620,21 +387,28 @@ void safe_run(char *cmd)
  }
 }
 
-void save_line(char *line)
+void iptables_save_line(char *line, int ipv6)
 {
- fprintf(iptables_file,"%s\n",line);
+ if(ipv6)
+ {
+  fprintf(ip6tables_file,"%s\n",line);
+ }
+ else
+ {
+  fprintf(iptables_file,"%s\n",line);
+ }
 }
 
-void run_restore(void)
+void run_iptables_restore(void)
 {
  char *restor;
  string(restor,STRLEN);
 
  /*-----------------------------------------------------------------*/
- printf("Running %s <%s ...\n",iptablesrestore,iptablesfile);
+ printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);
  /*-----------------------------------------------------------------*/
- 
- save_line("COMMIT");
+
+ iptables_save_line("COMMIT", FALSE);
  fclose(iptables_file);
  if(dry_run) 
  {
@@ -642,64 +416,31 @@ void run_restore(void)
   {
    printf("%s\n",_);
   }
-  done;
+  done; /* ugly macro end */
  }
 
  sprintf(restor,"%s <%s",iptablesrestore, iptablesfile);
  safe_run(restor);
- 
- free(restor);
-}
-
-/* == This function strips extra characters after IP address and stores it = */
-
-void parse_ip(char *str)
-{
- char *ptr,*ipaddr=NULL,*ipname=NULL,*lmsid=NULL;
 
- ptr=strchr(str,'{');
- if(ptr)
+ if(ip6prefix)
  {
-  lmsid=++ptr;
-  while(*ptr && *ptr!='}')
+  /*-----------------------------------------------------------------*/
+  printf("Running %s <%s ...\n", ip6tablesrestore, ip6tablesfile);
+  /*-----------------------------------------------------------------*/
+  iptables_save_line("COMMIT", TRUE);
+  fclose(ip6tables_file);
+  if(dry_run) 
   {
-   ptr++;
+   parse(ip6tablesfile)
+   {
+    printf("%s\n",_);
+   }
+   done; /* ugly macro end */
   }
-  *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));
- else
- {
-  TheIP();
- }
- ip->addr=ipaddr;
- ip->name=ipname;
- if(lmsid)
- {
-  ip->lmsid=atoi(lmsid);
-  found_lmsid=1;
+  sprintf(restor,"%s <%s",ip6tablesrestore, ip6tablesfile);
+  safe_run(restor);
  }
+ free(restor);
 }
 
 char *parse_datafile_line(char *str)
@@ -718,226 +459,6 @@ char *parse_datafile_line(char *str)
  }
 }
 
-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="(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];
-  }
- }
- 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;
-  }
- }
- printf("Analysing traffic for %s %s ...\n",month,year);
-
- /* 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) 
- {
-  if(strstr(str,".log"))
-  {
-    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->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.");
-    }
-  }
- }
- 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=\"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 align=\"left\">%s</td><td align=\"right\">", 
-               i++, iplog->name); 
-    if(iplog->lmsid > 0)
-    {
-     /*base URL will be configurable soon ... */
-     fprintf(f, "<a href=\"%s%d\">%04d</a>\n", lms_url, iplog->lmsid, iplog->lmsid);
-    }
-    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));
-   }
-
-   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) ? :-))      */
@@ -945,30 +466,33 @@ void parse_ip_log(int argc, char **argv)
 
 program
 {
- int i=0;
- FILE *f=NULL;
- char *str, *ptr, *d;
+ int i=0;                    /* just plain old Fortran style integer :-) */
+ FILE *f=NULL;               /* everything is just stream of bytes... */
+ char *str, *ptr, *d;        /* LET A$=B$ :-) */
  char *substring;
- int class_count=0,ip_count=0;
- int parent=1;
- 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;
+
+ int parent        = 1;
+ int just_networks = FALSE;  
+ int just_flush    = FALSE;       /* deactivates all previous actions */
+ int nodelay       = FALSE;
+ int just_preview  = FALSE;       /* preview - generate just stats */
+ int start_shaping = FALSE;       /* apply FUP - requires classmap file */
+ int stop_shaping  = FALSE;       /* lift FUP - requires classmap file */
+ int reduce_ceil     = 0;           /* allow only rate+(ceil-rate)/2, /4, etc. */
+ 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-2011 Michael Polak (xChaos)\n\
+Version %s - Copyright (C)2005-2013 Michael Polak, Arachne Labs\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: ----*/
-   
+ /*----- Boring... we have to check command line options first: ----*/   
  arguments
  {
   argument("-c") { nextargument(config); }
@@ -977,8 +501,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   argument("-f") { run=TRUE; just_flush=TRUE; }
   argument("-9") { run=TRUE; just_flush=9; }
   argument("-p") { run=TRUE; just_preview=TRUE; }
+  argument("-q") { run=TRUE; just_preview=TRUE; stop_shaping=TRUE; }
+  argument("-2") { run=TRUE; just_preview=TRUE; reduce_ceil=2; }
+  argument("-4") { run=TRUE; just_preview=TRUE; reduce_ceil=4; }
+  argument("-s") { run=TRUE; just_preview=TRUE; start_shaping=TRUE; }
   argument("-r") { run=TRUE; }
   argument("-n") { run=TRUE; nodelay=TRUE; }
+  argument("-a") { run=TRUE; just_networks=TRUE; }
   argument("-l") { just_logs=TRUE; }
   argument("-m") { just_logs=TRUE; }
   argument("-y") { just_logs=TRUE; }
@@ -1013,142 +542,56 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
  if(althosts)
  {
-  hosts=althosts;
+  hosts = althosts;
  }
 
- if(just_flush<9)
- {
-  /*-----------------------------------------------------------------*/
-  puts("Parsing iptables verbose output ...");
-  /*-----------------------------------------------------------------*/
-  get_traffic_statistics();
- }
-
- /*-----------------------------------------------------------------*/
- printf("Parsing class defintion file %s ...\n", hosts);
- /*-----------------------------------------------------------------*/
- int groupidx = FIRSTGROUPID;
- parse(hosts)
- {
-  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-");
-  if(substring)
-  { 
-   substring+=8; //"sharing-"
-   parse_ip(str);
-   ip_count++;
-   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 ?
-
-   if_exists(keyword,keywords,(substring=strstr(str,keyword->key)))
-   {
-    parse_ip(str);
-    ip_count++;
-    ip->keyword=keyword;
-    keyword->ip_count++;
-    ip->prio=keyword->default_prio;
-    substring+=strlen(keyword->key)+1;
-    ptr=substring;
-    while(*ptr && *ptr!='-')
-    {
-     ptr++;
-    }
-    if(*ptr=='-')
-    {
-     *ptr=0;
-     ip->max=ip->desired=atoi(ptr+1);
-    }
-    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;
-    }
-    if(ip->max<=ip->min)
-    {
-     ip->fixedprio=1;
-     ip->max=ip->min+ip->keyword->reserve_min;
-    }
-    else 
-    {
-     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;
-     ip->group = group->id;   
-    }
-    else
-    {
-     create(group,Group);
-     group->min=ip->min;
-     group->id = groupidx++;
-     ip->group = group->id;
-
-     if(group->min<8) group->min=8;
-     /* Warning - this is maybe because of primitive tc namespace, can be fixed */
-     /* it is because class IDs are derived from min. bandwidth. - xCh */
-     //if(group->min>MAX_GUARANTED_KBPS) group->min=MAX_GUARANTED_KBPS;
-     
-     group->count=1;
-     group->desired=ip->min;   
-     insert(group,groups,desc_order_by,min);
-    }
-   }//endif keyword-
-  }//endif sharing-
- }
- fail
+ if(just_flush<9)
  {
-  perror(hosts);
-  exit(-1);
+  /*-----------------------------------------------------------------*/
+  puts("Parsing iptables verbose output ...");
+  /*-----------------------------------------------------------------*/
+  get_traffic_statistics(iptables, FALSE);
+  if(ip6prefix)
+  {
+   /*-----------------------------------------------------------------*/
+   puts("Parsing ip6tables verbose output ...");
+   /*-----------------------------------------------------------------*/  
+   get_traffic_statistics(ip6tables, TRUE);
+  }
  }
- done;
 
  /*-----------------------------------------------------------------*/
  /* cll1.h - let's allocate brand new character buffer...           */
  /*-----------------------------------------------------------------*/
  string(str,STRLEN); 
 
+ /*-----------------------------------------------------------------*/
+ printf("Parsing class defintion file %s ...\n", hosts);
+ /*-----------------------------------------------------------------*/
+ parse_hosts(hosts);
+ if(just_networks)
+ {
+  analyse_topology("/usr/sbin/traceroute -n -m 10 -w 2 %s.%d");
+  exit(-1); 
+ }
+
  /*-----------------------------------------------------------------*/
  puts("Resolving shared connections ...");
  /*-----------------------------------------------------------------*/
- for_each(ip,ips) if(ip->sharing)
+ for_each(ip, ips) if(ip->sharing)
  {
-  for_each(sharedip,ips) if(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;
+   sharedip->traffic += ip->traffic;
+   ip->traffic = 0;
+   ip->mark = sharedip->mark; 
+   ip->lmsid = sharedip->lmsid;
    break;
   }
-  if(!sharedip)
+  if(not 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);
   }
  }
 
@@ -1168,7 +611,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     }
    }
   }
-  done;
+  done; /* ugly macro end */
  }
 
  if(!just_preview)
@@ -1177,22 +620,34 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   puts("Initializing iptables and tc classes ...");
   /*-----------------------------------------------------------------*/
   
-  iptables_file=fopen(iptablesfile,"w");
-  if (iptables_file == NULL)
+  iptables_file = fopen(iptablesfile, "w");
+  if(iptables_file == NULL)
   {
-    puts("Cannot open iptablesfile!");
+    perror(iptablesfile);
     exit(-1);
   }
-  
-  log_file=fopen(cmdlog,"w");
-  if (log_file == NULL) 
+  iptables_save_line(iptablespreamble, FALSE);
+
+  if(ip6prefix)
   {
-    puts("Cannot open logfile!");
-    exit(-1);
+   ip6tables_file = fopen(ip6tablesfile, "w");
+   if(ip6tables_file == NULL)
+   {
+     perror(ip6tablesfile);
+     exit(-1);
+   }
+   iptables_save_line(iptablespreamble, TRUE);
+   iptables_save_line(ip6preamble, TRUE);
   }
+
+  run_iptables_restore();
   
-  save_line(iptablespreamble);
-  run_restore();
+  log_file = fopen(cmdlog, "w");
+  if(log_file == NULL) 
+  {
+    perror(cmdlog);
+    exit(-1);
+  }  
   
   sprintf(str,"%s qdisc del dev %s root 2>/dev/null",tc,lan);
   safe_run(str);
@@ -1201,24 +656,30 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   safe_run(str);
   
   iptables_file=fopen(iptablesfile,"w");
-  save_line(iptablespreamble);
+  iptables_save_line(iptablespreamble, FALSE);
+  if(ip6prefix)
+  {
+   ip6tables_file=fopen(ip6tablesfile,"w");
+   iptables_save_line(iptablespreamble, TRUE);
+   iptables_save_line(ip6preamble, TRUE);
+  }
 
-  if(qos_free_zone && *qos_free_zone!='0')
+  if(qos_free_zone && *qos_free_zone!='0') /* this is currently supported only for IPv4 */
   {
    char *chain;
    
    sprintf(str,"-A FORWARD -d %s -o %s -j ACCEPT", qos_free_zone, wan);
-   save_line(str);
+   iptables_save_line(str, FALSE); /* this is currently supported only for IPv4 */
    
    if(qos_proxy)
    {
-    save_line(":post_noproxy - [0:0]");
-    sprintf(str,"-A POSTROUTING -p ! tcp -o %s -j post_noproxy", lan);
-    save_line(str);   
-    sprintf(str,"-A POSTROUTING -s ! %s -o %s -j post_noproxy", proxy_ip, lan);
-    save_line(str);   
-    sprintf(str,"-A POSTROUTING -s %s -p tcp --sport ! %d -o %s -j post_noproxy", proxy_ip, proxy_port, lan);
-    save_line(str);   
+    iptables_save_line(":post_noproxy - [0:0]", FALSE);
+    sprintf(str,"-A POSTROUTING ! -p tcp -o %s -j post_noproxy", lan);
+    iptables_save_line(str , FALSE);
+    sprintf(str,"-A POSTROUTING ! -s %s -o %s -j post_noproxy", proxy_ip, lan);
+    iptables_save_line(str, FALSE);
+    sprintf(str,"-A POSTROUTING -s %s -p tcp ! --sport %d -o %s -j post_noproxy", proxy_ip, proxy_port, lan);
+    iptables_save_line(str, FALSE);
 
     chain="post_noproxy";    
    }
@@ -1228,23 +689,36 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    }
     
    sprintf(str,"-A %s -s %s -o %s -j ACCEPT", chain, qos_free_zone, lan);
-   save_line(str);
+   iptables_save_line(str, FALSE);
   }
   
-  if(ip_count>idxtable_treshold1 && !just_flush)
+  if(ip_count > idxtable_treshold1 && !just_flush)
   {
-   int idxcount=0, bitmask=32-idxtable_bitmask1; /* default net mask: 255.255.255.240 */
+   int idxcount=0, bitmask=32-idxtable_bitmask1;
    char *subnet, *buf;
    /*-----------------------------------------------------------------*/
    printf("Detected %d addresses - indexing iptables rules to improve performance...\n",ip_count);
    /*-----------------------------------------------------------------*/
 
-   save_line(":post_common - [0:0]");
-   save_line(":forw_common - [0:0]");
+   iptables_save_line(":post_common - [0:0]", FALSE);
+   iptables_save_line(":forw_common - [0:0]", FALSE);
+   if(ip6prefix)
+   {
+    iptables_save_line(":post_common - [0:0]", TRUE);
+    iptables_save_line(":forw_common - [0:0]", TRUE);
+   }
 
-   for_each(ip,ips) if (ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0"))
+   for_each(ip,ips) if(ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0")) 
    {
-    buf=hash_id(ip->addr,bitmask);
+    if(ip->v6)
+    {
+     buf=index6_id(ip->addr,bitmask+32);
+    }
+    else
+    {
+     buf=index_id(ip->addr, bitmask);
+    }
+    
     if_exists(idx,idxs,eq(idx->id,buf))
     {
      idx->children++;
@@ -1252,25 +726,33 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     else
     {
      create(idx,Index);
-     idx->addr=ip->addr;
-     idx->id=buf;
-     idx->bitmask=bitmask;
-     idx->parent=NULL;
-     idx->children=0;
+     idx->addr = ip->addr;
+     idx->id = buf;
+     idx->bitmask = bitmask+32*ip->v6;
+     idx->parent = NULL;
+     idx->children = 0;
+     idx->ipv6 = ip->v6;
      idxcount++;
      push(idx,idxs);
     }
    }
 
    /* brutal perfomance optimalization */
-   while(idxcount>idxtable_treshold2 && bitmask>2*idxtable_bitmask2)
+   while(idxcount > idxtable_treshold2 && bitmask > 2*idxtable_bitmask2)
    {
-    bitmask-=idxtable_bitmask2;
-    idxcount=0;
+    bitmask -= idxtable_bitmask2;
+    idxcount = 0;
 
     for_each(idx,idxs) if(idx->parent == NULL)
     {
-     buf=hash_id(idx->addr,bitmask);
+     if(idx->ipv6)
+     {
+      buf = index6_id(idx->addr, bitmask+32);
+     }
+     else
+     {
+      buf = index_id(idx->addr, bitmask);
+     }
      if_exists(metaindex,idxs,eq(metaindex->id,buf))
      {
       metaindex->children++;
@@ -1278,11 +760,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      else
      {
       create(metaindex,Index);
-      metaindex->addr=idx->addr;
-      metaindex->id=buf;
-      metaindex->bitmask=bitmask;
-      metaindex->parent=NULL;
-      metaindex->children=0;
+      metaindex->addr = idx->addr;
+      metaindex->id = buf;
+      metaindex->bitmask = bitmask+32*idx->ipv6;
+      metaindex->parent = NULL;
+      metaindex->children = 0;
+      metaindex->ipv6 = idx->ipv6;
       idxcount++;
       push(metaindex,idxs);
      }
@@ -1290,26 +773,33 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     }
    }
 
-   /* this should slightly optimize throughout ... */
+   /* this should slightly optimize throughput ... */
    sort(idx,idxs,desc_order_by,children);
    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);
+    if(idx->ipv6)
+    {
+     subnet=subnet6_id(idx->addr, idx->bitmask);
+    }
+    else
+    {
+     subnet=subnet_id(idx->addr, idx->bitmask);
+    }
+    printf("%d: %s/%d\n", ++i, subnet, idx->bitmask);
        
     sprintf(str,":post_%s - [0:0]", idx->id);
-    save_line(str);
+    iptables_save_line(str, idx->ipv6);
 
     sprintf(str,":forw_%s - [0:0]", idx->id);
-    save_line(str);
+    iptables_save_line(str, idx->ipv6);
 
     if(idx->parent)
     {
      string(buf,strlen(idx->parent->id)+6);
-     sprintf(buf,"post_%s",idx->parent->id);
+     sprintf(buf,"post_%s", idx->parent->id);
     }
     else
     {
@@ -1317,10 +807,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     }
 
     sprintf(str,"-A %s -d %s/%d -o %s -j post_%s", buf, subnet, idx->bitmask, lan, idx->id);
-    save_line(str);
+    iptables_save_line(str, idx->ipv6);
 
     sprintf(str,"-A %s -d %s/%d -o %s -j post_common", buf, subnet, idx->bitmask, lan);
-    save_line(str);
+    iptables_save_line(str, idx->ipv6);
 
     if(idx->parent)
     {
@@ -1333,26 +823,37 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     }
 
     sprintf(str,"-A %s -s %s/%d -o %s -j forw_%s", buf, subnet, idx->bitmask, wan, idx->id);
-    save_line(str);
+    iptables_save_line(str, idx->ipv6);
 
     sprintf(str,"-A %s -s %s/%d -o %s -j forw_common", buf, subnet, idx->bitmask, wan);
-    save_line(str);
+    iptables_save_line(str, idx->ipv6);
    }
    printf("Total indexed iptables chains created: %d\n", i);
 
    sprintf(str,"-A FORWARD -o %s -j forw_common", wan);
-   save_line(str);
+   iptables_save_line(str, FALSE);
    
    sprintf(str,"-A POSTROUTING -o %s -j post_common", lan);
-   save_line(str);
+   iptables_save_line(str, FALSE);
+
+   if(ip6prefix)
+   {
+    sprintf(str,"-A FORWARD -o %s -j forw_common", wan);
+    iptables_save_line(str, TRUE);
+    
+    sprintf(str,"-A POSTROUTING -o %s -j post_common", lan);
+    iptables_save_line(str, TRUE);
+   }
   }
- 
  }
 
  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);
  }
@@ -1440,13 +941,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     
     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))) )
+     ip->realquota=ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20));
+     if(     ip->keyword->data_limit 
+         and not ip->fixedprio 
+         and ip->traffic > ip->realquota )
      {
-      if(group_rate<ip->max)
+      if(group_rate < ip->max)
       {
-       ip->max=group_rate;
+       ip->max = group_rate;
       }
       group_rate+=magic_treshold;
       ip->prio=lowest_priority;
@@ -1491,365 +993,125 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
  if(just_preview)
  {
-  f=fopen(preview,"w");
-  ptr=preview; 
- }
- else if(!dry_run && !just_flush)
- {
-  /*-----------------------------------------------------------------*/
-  printf("Writing data transfer database ...\n");
-  /*-----------------------------------------------------------------*/
-  f=fopen("/var/run/prometheus.previous","w");
-  if(f)
+  if(start_shaping || stop_shaping || reduce_ceil)
   {
-   for_each(ip,ips) if(ip->traffic || ip->direct || ip->proxy || ip->upload)
+   printf("Reading %s and applying Fair Use Policy rules ... \n", classmap);
+   parse(classmap)
    {
-    fprintf(f,"%s %Lu %Lu %Lu %Lu\n",
-              ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);
+    ptr=strchr(_,' ');
+    if(ptr)
+    {
+     *ptr=0;
+     ptr++;
+     if_exists(ip,ips,eq(ip->addr,_))
+     {
+      ip->mark=atoi(ptr);
+      if(ip->max < ip->desired || stop_shaping || reduce_ceil) /* apply or disable FUP limit immediately.... */
+      {
+       if(stop_shaping)
+       {
+        ip->max = ip->desired;
+        printf("Removing limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark);               
+       }
+       else
+       {
+        printf("Applying limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark);
+        if(reduce_ceil)
+        {
+         ip->max = ip->min + (ip->desired-ip->min)/reduce_ceil;
+        }
+       }
+       printf("(down: %dk-%dk ", ip->min, ip->max); 
+       sprintf(str, "%s class change 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);
+       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));
+       sprintf(str,"%s class change dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",
+                    tc, wan, ip->group, ip->mark,
+                    (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),
+                    (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio);
+       safe_run(str);
+      }
+     }
+    }
+   }
+   fail
+   { 
+    perror(classmap);
+    puts("Warning - classmap file not fund, just generating preview ...");
+    start_shaping=FALSE;
+    stop_shaping=FALSE;
    }
-   fclose(f);
+   done; /* ugly macro end */
   }
-
-  f=fopen(html,"w");
-  ptr=html;
+  html=preview;
+  json_traffic=json_preview;
  }
 
- if(f)
+ if(!dry_run && !just_flush)
  {
-  int count=1;
-  i=0;
-
   /*-----------------------------------------------------------------*/
-  printf("Sorting data and generating statistics page %s ...\n", ptr);
+  printf("Writing json traffic overview  %s ... ", json_traffic);
   /*-----------------------------------------------------------------*/
+  write_json_traffic(json_traffic);
 
-  if(use_jquery_popups)
-  {
-   fprintf(f,"<script type=\"text/javascript\" src=\"%s\"></script>\n", jquery_url);
-  }
-  fputs("<table border>\n<tr><th align=\"right\">#</th><th align=\"right\">group</th><th align=\"right\">IPs</th><th align=\"right\">requested</th>\n",f);
-  fprintf(f,"<th colspan=\"%d\">data limits</th>\n", keywordcount);
-  fputs("</tr>\n",f);
-
-  for_each(group, groups) 
-  { 
-#ifdef DEBUG
-   printf("%d k group: %d bandwidth requested: %d k\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);
-
-   for_each(keyword, keywords)
-   {
-    fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%d M</span></td>",
-              keyword->html_color, group->min*keyword->data_limit);
-   }   
-   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);
-#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);
-
-   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);
-
-   fputs("</table>\n",f);
- }
- else if(!dry_run && !just_flush)
- {
-  perror(html);
+  /*-----------------------------------------------------------------*/
+  printf("Writing statistics into HTML page %s ...\n", html);
+  /*-----------------------------------------------------------------*/
+  write_htmlandlogs(html, d, total, just_preview);
  }
 
- i=0;
- if(f)
+ if(just_preview)
  {
-  unsigned long long total_traffic=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;
-  int active_classes=0;
-  int colspan=11;
-  FILE *iplog;
-  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)
+  char swchar='p';
+  if(start_shaping)
   {
-   colspan++;
+   swchar='s';
   }
-  if(found_lmsid)
+  else if(reduce_ceil)
   {
-   colspan++;
+   swchar='0'+reduce_ceil; /* -2, -4 */
   }
-  
-  fprintf(f,"<p><table border>\n<tr><th colspan=\"%d\">%s",colspan,title);
-  fprintf(f," (%s)</th></tr>\n", d);
-  fputs("<tr><td align=\"right\">#</td><td>hostname</td>",f);
-  if(found_lmsid)
-  {
-   fputs("<td align=\"right\">lms</td>\n",f);
-  }
-  fputs("<td align=\"right\">credit</td>\
-<td align=\"right\">limit</td>\
-<td align=\"right\">total</td>\
-<td align=\"right\">direct</td>\n",f);
-  if(qos_proxy)
+  else if(stop_shaping)
   {
-   fputs("<td align=\"right\">proxy</td>\n",f);
+   swchar='q';
   }
-  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) if(!use_jquery_popups || !ip->sharing)
-  {
-   char *f1="", *f2="";
-   i++;
-      
-   if(ip->max < ip->desired)
-   {
-    f1="<span style=\"color:red\">";
-    f2="</span>";
-    limit_count++;
-   }
-   else if(ip->prio > highest_priority+1)
-   {
-    f1="<span style=\"color:brown\">";
-    f2="</span>";
-    prio_count++;
-   }
+  printf("Statistics preview generated (-%c switch) - now exiting ...\n", swchar);
+  exit(0);
+ }  
 
+ i=0;
 #ifdef DEBUG
-   printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); 
+ printf("%-22s %-15s mark\n","name","ip");
 #endif
-   /* hostnames -------------------------------------- */
-   fprintf(f,"<tr><td align=\"right\"><a name=\"%s\"></a>%d</td><td><a href=\"%s%s.log\">%s</a>\n", ip->name, i, log_url, ip->name, ip->name);
-   if(use_jquery_popups)
-   {
-     fprintf(f,"<span id=\"sharing_%d\" style=\"display:none\">",i);
-     popup_button=0;
-     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))
-     {
-      fprintf(f,"<br /><a href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);
-      popup_button++;
-     }
-     fputs("</span>\n",f);
-     if(popup_button)
-     {
-      fprintf(f,"<span>[<a href=\"#\" onClick=\"$(this).parent().hide();$(\'#sharing_%d\').show();$(\'#download_%d\').show();$(\'#upload_%d\').show();return(false);\" style=\"cursor: pointer;\">+%d</a>]</span>",
-                i, i, i, popup_button);
-     }
-   }
-   fputs("</td>\n",f);
-   /* ----------------------------------------------- */
-
-   if(found_lmsid)
-   {
-    fputs("<td align=\"right\">",f);
-    if(ip->lmsid > 0)
-    {
-     /*base URL will be configurable soon ... */
-     fprintf(f,"<a href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);
-    }
-    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\"><span style=\"color:#%s\">%Lu M</span></td>",
-             ip->keyword->html_color,
-             ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));
-   fprintf(f,"<td align=\"right\">%s%Lu M%s", f1, ip->traffic, f2);
-
-   /* download --------------------------------------- */
-   fprintf(f,"</td><td align=\"right\">%Lu M", 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 M", sharedip->direct);
-     }
-     fputs("</span>\n",f);
-   }
-   fputs("</td>\n",f);
-   /* ----------------------------------------------- */
-
-   if(qos_proxy)
-   {
-    fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->proxy);
-   }
-   /* upload ---------------------------------------- */
-   fprintf(f,"<td align=\"right\">%Lu M", 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 M", sharedip->upload);
-     }
-     fputs("</span>\n",f);
-   }
-   fputs("</td>\n",f);
-   /* ----------------------------------------------- */
-
-   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;
-   if(ip->traffic>0)
-   {
-    active_classes++;
-    tmp_sum+=ip->traffic;
-    create(sum,Sum);
-    sum->l=tmp_sum;
-    sum->i=active_classes;
-    insert(sum,sums,order_by,i);
-   }
-
-   if(!just_preview)
-   {
-    sprintf(str,"%s/%s.log",log_dir,ip->name);
-    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%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=\"%d\" align=\"left\">%d CLASSES</th>", colspan-7, i);
-  fprintf(f,"<th align=\"right\">%Lu M</th><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);
-  fprintf(f,"<th colspan=\"4\"><span style=\"color:red\">FUP-LIMIT %dx</span> <span style=\"color:brown\">LOW-PRIO %dx</span></th></tr>\n</table>\n",limit_count,prio_count);
-
-  if(active_classes>10)
-  {
-   int top20_count=0,top20_perc1=0;
-   long long top20_perc2=0;
-   unsigned long long top20_sum=0l;
-  
-   fputs("<a name=\"erp\"></a><p><table border><tr><th colspan=\"5\">Enterprise Resource Planning (ERP)</th></tr>\n",f);
-   fputs("<tr><td>Analytic category</td>\n",f);
-   fputs("<td colspan=\"2\" align=\"center\">Active Classes</td><td colspan=\"2\" align=\"center\">Data transfers</td></tr>\n",f);
-
-   if_exists(sum,sums,sum->l>=total_traffic/4)
-   {
-    fprintf(f,"<tr><td>Top 25%% of traffic</td>\n");
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
-   }
-   
-   if_exists(sum,sums,sum->i==10)
-   {
-    fprintf(f,"<tr><td>Top 10 downloaders</td>\n");
-    fprintf(f,"<th align=\"right\">10</th><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
-   }
-
-   if_exists(sum,sums,sum->l>=total_traffic/2)
-   {
-    fprintf(f,"<tr><td>Top 50%% of traffic</td>\n");
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><th align=\"right\">%Ld %%</th></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
-   }
-
-   if_exists(sum,sums,sum->l>=4*total_traffic/5)
-   {
-    fprintf(f,"<tr><td>Top 80%% of traffic</td>\n");
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><th align=\"right\">%Ld %%</th></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
-   }
-
-   if_exists(sum,sums,sum->i>=(active_classes+1)/5)
-   {
-    fprintf(f,"<tr><td>Top 20%% downloaders</td>\n");
-    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);
-   }
-
-   if_exists(sum,sums,sum->i>=(active_classes+1)/4)
-   {
-    fprintf(f,"<tr><td>Top 25%% downloaders</td>\n");
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
-   }
-
-   if_exists(sum,sums,sum->i>=(active_classes+1)/2)
-   {
-    fprintf(f,"<tr><td>Top 50%% downloaders</td>\n");
-    fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
-   }
-
-   if_exists(sum,sums,sum->i>=4*(active_classes+1)/5)
-   {
-    fprintf(f,"<tr><td>Top 80%% downloaders</td>\n");
-    fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
-   }
-
-   fprintf(f,"<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 %%\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);
-    }
-   }
-  }
-
-  fprintf(f, stats_html_signature, version);
-  fclose(f);
- }
 
- if(just_preview)
+ printf("Writing %s", classmap); 
+ f = fopen(classmap, "w"); 
+ if(f < 0)
  {
-  puts("Statistics preview generated (-p switch) - now exiting ...");
-  exit(0);
+  perror(classmap);
  }
-  
+
  /*-----------------------------------------------------------------*/
- puts("Generating iptables and tc classes ...");
+ printf(" + generating iptables and tc classes ... ");
  /*-----------------------------------------------------------------*/
 
- i=0;
- printf("%-22s %-15s mark\n","name","ip");
-
- for_each(ip,ips) if(ip->mark>0)
- { 
+ for_each(ip, ips) if(ip->mark > 0) /* works only for IPv4 so far */
+ {
   if(idxs)
   {
    char *buf;
    duplicate(ip->addr,buf);
-   buf=hash_id(ip->addr,32-idxtable_bitmask1); 
+   if(ip->v6)
+   {
+    buf=index6_id(ip->addr,64-idxtable_bitmask1);
+   }
+   else
+   {
+    buf=index_id(ip->addr,32-idxtable_bitmask1);
+   }
    
    string(chain_forward,6+strlen(buf));
    strcpy(chain_forward,"forw_");
@@ -1867,55 +1129,67 @@ 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 MARK --set-mark %d",chain_postrouting,ip->addr,lan,ip->mark);*/
+  sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",
+               chain_postrouting, ip->addr, 32*(1+ip->v6), lan, mark_iptables, ip->mark);
   /* -m limit --limit 1/s */  
-  save_line(str);
+  iptables_save_line(str, ip->v6);
 
   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 MARK --set-mark %d",chain_postrouting,proxy_ip,proxy_port,ip->addr,lan,ip->mark);*/
-   save_line(str);
+   sprintf(str, "-A %s -s %s -p tcp --sport %d -d %s/%d -o %s -j %s%d",
+                chain_postrouting, proxy_ip, proxy_port, ip->addr, 32*(1+ip->v6), lan, mark_iptables, ip->mark);
+   iptables_save_line(str, ip->v6);
   }
 
-  sprintf(str,"-A %s -d %s/32 -o %s -j ACCEPT",chain_postrouting,ip->addr,lan);
-  save_line(str);
+  sprintf(str, "-A %s -d %s/%d -o %s -j ACCEPT",
+               chain_postrouting, ip->addr, 32*(1+ip->v6), lan);
+  iptables_save_line(str, ip->v6);
 
   /* -------------------------------------------------------- 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 MARK --set-mark %d",chain_forward,ip->addr,wan,ip->mark);*/
-  save_line(str);
+  sprintf(str, "-A %s -s %s/%d -o %s -j %s%d", 
+               chain_forward, ip->addr, 32*(1+ip->v6), wan, mark_iptables, ip->mark);
+  iptables_save_line(str, ip->v6);
 
-  sprintf(str,"-A %s -s %s/32 -o %s -j ACCEPT",chain_forward,ip->addr,wan);
-  save_line(str);
+  sprintf(str, "-A %s -s %s/%d -o %s -j ACCEPT",
+               chain_forward, ip->addr, 32*(1+ip->v6), wan);
+  iptables_save_line(str, ip->v6);
 
   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*/
-     safe_run(str);
-   }   
-   if (filter_type == 1)
+    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);
+    sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",
+                 tc, lan, ip->mark, ip->mark);
+    safe_run(str);
    }
 
    /* -------------------------------------------------------- upload class */
+#ifdef DEBUG
    printf("up: %dk-%dk)\n", (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), 
                             (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed));
+#endif
 
    sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",
                 tc, wan, ip->group, ip->mark,
@@ -1923,61 +1197,95 @@ 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*/
-     safe_run(str);
+    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);
-     safe_run(str);
+    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 > 0)
+   {
+    fprintf(f, "%s %d\n", ip->addr, ip->mark);
    }
   }
   else
+  {
+#ifdef DEBUG
    printf("(sharing %s)\n", ip->sharing);
+#endif
+  }
   i++;
  }
-
+ if(f > 0)
+ {
+  puts("done.");
+  fclose(f);
+ }
+ 
  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";
  }
- /* -------------------------------- classify or reject free download */
+
+ if(free_min)
  {
-   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);
+  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);
+   iptables_save_line(str, FALSE); /* only for IPv4 */
+  }
+  sprintf(str, "-A %s -s %s -p tcp --sport %d -o %s -j %s",
+               chain_postrouting,proxy_ip,proxy_port,lan,final_chain);
+  iptables_save_line(str, FALSE); /* only for IPv4 */
+ }
+
+ if(free_min)
+ {
+  sprintf(str, "-A %s -o %s -j %s%d",
+               chain_postrouting, lan, mark_iptables, 3);
+  iptables_save_line(str, FALSE); /* only for IPv4 */
+ }
+
+ sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);
+ iptables_save_line(str, FALSE);
+ if(ip6prefix)
+ {
+  sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);
+  iptables_save_line(str, TRUE);
+ }
+
+ if(free_min)
+ {
+  sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, 3);
+  iptables_save_line(str, FALSE); /* only for IPv4 */
+ }
+
+ sprintf(str,"-A %s -o %s -j %s", chain_forward, wan, final_chain);
+ iptables_save_line(str, FALSE);
+ if(ip6prefix)
+ {
+  sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);
+  iptables_save_line(str, TRUE);
  }
 
  if(free_min) /* allocate free bandwith if it is not zero... */ 
@@ -1986,30 +1294,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);
+ run_iptables_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... */