not tested - initial commit only

git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@256 251d49ef-1d17-4917-a970-b30cf55b089b

diff --git a/htmlandlogs.c b/htmlandlogs.c
index 70377848b7c501bd89f458541495d637d9ecf941..b6f9cb66602c080c23b220dd177cd2076a95df98 100644 (file)
--- a/htmlandlogs.c
+++ b/htmlandlogs.c
@@ -14,7 +14,6 @@ extern const char *version;
 extern const char *stats_html_signature;\r
 extern char *jquery_url;\r
 extern int keywordcount;\r
 extern const char *stats_html_signature;\r
 extern char *jquery_url;\r
 extern int keywordcount;\r

-extern long long int line;\r

 extern int dry_run;\r
 extern int qos_proxy;\r
 extern char *title;\r
 extern int dry_run;\r
 extern int qos_proxy;\r
 extern char *title;\r


@@ -100,19 +99,19 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
    count++; \r
   }\r
 #ifdef DEBUG\r
    count++; \r
   }\r
 #ifdef DEBUG\r

-   printf("Total groups: %d Total bandwidth requested: %d kb/s\nAGGREGATION: 1/%d\n",\r
-          count, i, i/line);\r
+   printf("Total groups: %d Total bandwidth requested: %d kb/s\n",\r
+          count, i, i);\r

 #endif\r
    fprintf(f,"</tr></tbody>\n\\r
 <thead><tr>\n\\r
 #endif\r
    fprintf(f,"</tr></tbody>\n\\r
 <thead><tr>\n\\r

-<th colspan=\"2\" style=\"text-align: left\">Line %Ld kb/s</td>",line);\r
+<th colspan=\"2\" style=\"text-align: left\"></td>");\r

    fprintf(f,"<th style=\"text-align: right\">%d</td><th style=\"text-align: right\">%d kb/s</td>",total,i);\r
 \r
    for_each(keyword, keywords) if(keyword->ip_count)\r
    {\r
     fprintf(f,"<th style=\"text-align: right\">%d IPs</th>",keyword->ip_count);\r
    }\r
    fprintf(f,"<th style=\"text-align: right\">%d</td><th style=\"text-align: right\">%d kb/s</td>",total,i);\r
 \r
    for_each(keyword, keywords) if(keyword->ip_count)\r
    {\r
     fprintf(f,"<th style=\"text-align: right\">%d IPs</th>",keyword->ip_count);\r
    }\r

-   fprintf(f,"</tr><tr><th colspan=\"4\">Aggregation 1/%d</th>\n", (int)(0.5+i/line));\r
+   fprintf(f,"</tr><tr><th colspan=\"4\"></th>\n");\r

    fprintf(f,"<th colspan=\"%d\">%d traffic classes</th></tr>\n", keywordcount, total);\r
 \r
    fputs("</thead></table>\n",f);\r
    fprintf(f,"<th colspan=\"%d\">%d traffic classes</th></tr>\n", keywordcount, total);\r
 \r
    fputs("</thead></table>\n",f);\r

diff --git a/ipstruct.h b/ipstruct.h
index 542cb0aa7c7a16ecca6c841481d971565b7c5fe0..c7843f6349bf4bf9e10dd0ee92eddb866f293db3 100644 (file)
--- a/ipstruct.h
+++ b/ipstruct.h
@@ -72,5 +72,26 @@ struct Macro
  list(Macro);\r
 };\r
 \r
  list(Macro);\r
 };\r
 \r

+struct Index\r
+{\r
+ char *addr;\r
+ char *id;\r
+ struct Index *parent;\r
+ int bitmask;\r
+ int children;\r
+ int ipv6;\r
+ list(Index);\r
+};\r
+\r
+struct Interface \r
+{\r
+ char *name;\r
+ long long speed;\r
+ int is_upstream;\r
+ char *chain;\r
+ char *idxprefix;\r
+ list(Interface);\r
+};\r
+\r

 void TheIP(char *ipaddr, int is_network);\r
 /* function implemented in parsehosts.c */\r
 void TheIP(char *ipaddr, int is_network);\r
 /* function implemented in parsehosts.c */\r

diff --git a/parselogs.c b/parselogs.c
index 7eb2319daf324499ba7b0d13d7e19cbb03b03906..53c0bd7da56d5e0bbffd9811fc38e7ad455a9b14 100644 (file)
--- a/parselogs.c
+++ b/parselogs.c
@@ -1,4 +1,6 @@
 #include "cll1-0.6.2.h"\r
 #include "cll1-0.6.2.h"\r

+#include "cll1-0.6.2.h"\r
+\r

 #define STRLEN 512\r
 \r
 /* globals declared in prometheus.c */\r
 #define STRLEN 512\r
 \r
 /* globals declared in prometheus.c */\r


@@ -10,7 +12,6 @@ extern char *html_log_dir;
 extern int row_odd_even;\r
 extern char *log_url;\r
 extern char *lms_url;\r
 extern int row_odd_even;\r
 extern char *log_url;\r
 extern char *lms_url;\r

-extern long long int line;\r

 \r
 /* function implemented in prometheus.c */\r
 const char *tr_odd_even(void);\r
 \r
 /* function implemented in prometheus.c */\r
 const char *tr_odd_even(void);\r


@@ -213,9 +214,9 @@ void parse_ip_log(int argc, char **argv)
   fprintf(f,"</tbody><thead><tr>\\r
 <th colspan=\"3\" style=\"text-align: left\">Total:</th>\\r
 <th colspan=\"2\" style=\"text-align: right\"><strong>%ld&nbsp;GB</strong></th>\\r
   fprintf(f,"</tbody><thead><tr>\\r
 <th colspan=\"3\" style=\"text-align: left\">Total:</th>\\r
 <th colspan=\"2\" style=\"text-align: right\"><strong>%ld&nbsp;GB</strong></th>\\r

-<th style=\"text-align: right\"><strong>%Ld&nbsp;kb/s</strong></th>\\r
-<th style=\"text-align: right\"><strong>-</strong></th></tr>\\r
-\n", total, line);\r
+<th style=\"text-align: right\"></th>\\r
+<th style=\"text-align: right\"></th></tr>\\r
+\n", total);\r

   fputs("</thead></table>\n", f);\r
 \r
   row_odd_even = 0;\r
   fputs("</thead></table>\n", f);\r
 \r
   row_odd_even = 0;\r

diff --git a/prometheus.c b/prometheus.c
index 993b185aeda82202bc4a85313c847e8c11a677dc..d25ca51aa89b3baa0e9b62c193a56b141c937956 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,7 +7,7 @@
 /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */\r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
 /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */\r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r

-/* Modified by: xChaos, 20160622\r
+/* Modified by: xChaos, 20171012\r

                  ludva, 20080415\r
  \r
    Prometheus QoS is free software; you can redistribute it and/or\r
                  ludva, 20080415\r
  \r
    Prometheus QoS is free software; you can redistribute it and/or\r


@@ -29,10 +29,10 @@
 #include "cll1-0.6.2.h"\r
 #include "ipstruct.h"\r
 \r
 #include "cll1-0.6.2.h"\r
 #include "ipstruct.h"\r
 \r

-const char *version = "0.8.5-e";\r
+const char *version = "0.9.0-a";\r

 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r

-/* Versions: 0.8.5 is development release, 0.8.6 will be "stable"  */\r
+/* Versions: 0.9.0 is development release, 1.0 will be "stable"    */\r

 /* Official Trac URL: https://dev.arachne.cz/svn/prometheus        */\r
 /* Official SVN URL: https://dev.arachne.cz/repos/prometheus       */\r
 /* BTC donations account: 19rriLx8vR19wGefPaMhakqnCYNYwjLvxq       */\r
 /* Official Trac URL: https://dev.arachne.cz/svn/prometheus        */\r
 /* Official SVN URL: https://dev.arachne.cz/repos/prometheus       */\r
 /* BTC donations account: 19rriLx8vR19wGefPaMhakqnCYNYwjLvxq       */\r


@@ -40,7 +40,7 @@ const char *version = "0.8.5-e";
 /* Warning: unofficial Github mirror is not supported by author!  */\r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
 /* Warning: unofficial Github mirror is not supported by author!  */\r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r

-const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2015 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";\r
+const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2017 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";\r

 \r
 #define STRLEN 512\r
 #undef DEBUG\r
 \r
 #define STRLEN 512\r
 #undef DEBUG\r


@@ -59,6 +59,8 @@ const char               *ls = "/bin/ls"; /* this is not user configurable :-) *
 char          *config = "/etc/prometheus/prometheus.conf"; /* main configuration file */\r
 char           *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition file */\r
 char      *macrosfile = "/etc/prometheus/prometheus.macros"; /* rewrite rules for most common tariffs */\r
 char          *config = "/etc/prometheus/prometheus.conf"; /* main configuration file */\r
 char           *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition file */\r
 char      *macrosfile = "/etc/prometheus/prometheus.macros"; /* rewrite rules for most common tariffs */\r

+char    *upstreamfile = "/etc/prometheus/upstream.interfaces"; /* list of interfaces to manage */\r
+char  *downstreamfile = "/etc/prometheus/downstream.interfaces"; /* list of interfaces to manage */\r

 char    *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/\r
 char   *ip6tablesfile = "/var/spool/prometheus.ip6tables"; /* temporary file for ip6tables-restore*/\r
 char          *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */\r
 char    *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/\r
 char   *ip6tablesfile = "/var/spool/prometheus.ip6tables"; /* temporary file for ip6tables-restore*/\r
 char          *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */\r


@@ -92,11 +94,10 @@ int      enable_credit = TRUE; /* enable credit file */
 int         use_credit = FALSE; /* use credit file (if enabled)*/\r
 char            *title = "Hall of Fame - Greatest Suckers"; /* hall of fame title */\r
 int       hall_of_fame = TRUE; /* enable hall of fame */\r
 int         use_credit = FALSE; /* use credit file (if enabled)*/\r
 char            *title = "Hall of Fame - Greatest Suckers"; /* hall of fame title */\r
 int       hall_of_fame = TRUE; /* enable hall of fame */\r

-char              *lan = "eth0"; /* LAN interface */\r
-char       *lan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */\r
-char              *wan = "eth1"; /* WAN/ISP interface */\r
+char           *medium = "1000Mbit"; /* 10Mbit/100Mbit ethernet */\r
+//obsolete: char              *lan = "eth0"; /* LAN interface */\r
+//obsolete: char       *lan_medium = "1000Mbit"; /* 10Mbit/100Mbit ethernet */\r

 char        *ip6prefix = NULL; /* Prefix for global /48 IPv6 subnet */\r
 char        *ip6prefix = NULL; /* Prefix for global /48 IPv6 subnet */\r

-char       *wan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */\r

 char         *qos_leaf = "sfq perturb 5"; /* leaf discipline */\r
 char    *qos_free_zone = NULL; /* QoS free zone */\r
 /* int          qos_proxy = TRUE; include proxy port to QoS */\r
 char         *qos_leaf = "sfq perturb 5"; /* leaf discipline */\r
 char    *qos_free_zone = NULL; /* QoS free zone */\r
 /* int          qos_proxy = TRUE; include proxy port to QoS */\r


@@ -104,8 +105,8 @@ int        found_lmsid = FALSE; /* show links to users in LMS information system
 int     include_upload = TRUE; /* upload+download=total traffic */\r
 /* char         *proxy_ip = "192.168.1.1/32";  our IP with proxy port */\r
 /* int         proxy_port = 3128; proxy port number */\r
 int     include_upload = TRUE; /* upload+download=total traffic */\r
 /* char         *proxy_ip = "192.168.1.1/32";  our IP with proxy port */\r
 /* int         proxy_port = 3128; proxy port number */\r

-long long int     line = 1024; /* WAN/ISP download in kbps */\r
-long long int       up = 1024; /* WAN/ISP upload in kbps */\r
+//obsolete: long long int     line = 1024; /* WAN/ISP download in kbps */\r
+//obsolete: long long int       up = 1024; /* WAN/ISP upload in kbps */\r

 int           free_min = 256; /* minimum guaranted bandwidth for all undefined hosts */\r
 int           free_max = 512; /* maximum allowed bandwidth for all undefined hosts */\r
 int      overlimit_min = 256; /* minimum guaranted bandwidth for all undefined hosts */\r
 int           free_min = 256; /* minimum guaranted bandwidth for all undefined hosts */\r
 int           free_max = 512; /* maximum allowed bandwidth for all undefined hosts */\r
 int      overlimit_min = 256; /* minimum guaranted bandwidth for all undefined hosts */\r


@@ -135,6 +136,8 @@ struct IP *ips = NULL, *networks = NULL, *ip, *sharedip;
 struct Group *groups = NULL, *group;\r
 struct Keyword *keyword, *defaultkeyword=NULL, *keywords = NULL;\r
 struct Macro *macro, *macros = NULL;\r
 struct Group *groups = NULL, *group;\r
 struct Keyword *keyword, *defaultkeyword=NULL, *keywords = NULL;\r
 struct Macro *macro, *macros = NULL;\r

+struct Index *idxs = NULL, *idx, *metaindex;\r
+struct Interface *interfaces = NULL, *interface;\r

 \r
 #define FREE_CLASS      3\r
 #define OVERLIMIT_CLASS 4\r
 \r
 #define FREE_CLASS      3\r
 #define OVERLIMIT_CLASS 4\r


@@ -179,20 +182,6 @@ const char *tr_odd_even(void)
  }\r
 }\r
 \r
  }\r
 }\r
 \r

-/* ==== This is C<<1 stuff - learn C<<1 first! https://dev.arachne.cz/svn/cll1h ==== */\r
-/* (except that this code uses obsolete, archaic version of this header file...)     */\r
-\r
-struct Index\r
-{\r
- char *addr;\r
- char *id;\r
- struct Index *parent;\r
- int bitmask;\r
- int children;\r
- int ipv6;\r
- list(Index);\r
-} *idxs=NULL, *idx, *metaindex;\r
-\r

 \r
 /* ====== iptables indexes are used to reduce complexity to log8(N) ===== */\r
 \r
 \r
 /* ====== iptables indexes are used to reduce complexity to log8(N) ===== */\r
 \r


@@ -299,13 +288,11 @@ void get_config(char *config_filename)
   option("iptables-in-filename",iptablesfile);\r
   option("ip6tables-in-filename",ip6tablesfile);\r
   option("hosts",hosts);\r
   option("iptables-in-filename",iptablesfile);\r
   option("ip6tables-in-filename",ip6tablesfile);\r
   option("hosts",hosts);\r

-  option("lan-interface",lan);\r
-  option("wan-interface",wan);\r
+  option("downstream-interfaces-list-filename",downstreamfile);\r
+  option("upstream-interfaces-list-filename",upstreamfile);\r
+  option("macros-filename",upstreamfile);\r

   option("ip6-prefix",ip6prefix);\r
   option("ip6-prefix",ip6prefix);\r

-  option("lan-medium",lan_medium);\r
-  option("wan-medium",wan_medium);\r
-  lloption("wan-download",line);\r
-  lloption("wan-upload",up);\r
+  option("medium",medium);\r

   ioption("hall-of-fame-enable",hall_of_fame);\r
   ioption("digital-divide-weirdness-ratio",digital_divide);\r
   option("hall-of-fame-title",title);\r
   ioption("hall-of-fame-enable",hall_of_fame);\r
   ioption("digital-divide-weirdness-ratio",digital_divide);\r
   option("hall-of-fame-title",title);\r


@@ -375,13 +362,6 @@ void get_config(char *config_filename)
   mark = "MARK";\r
   mark_iptables = "MARK --set-mark ";\r
  }\r
   mark = "MARK";\r
   mark_iptables = "MARK --set-mark ";\r
  }\r

-\r
- /* are supplied values meaningful ?*/\r
- if(line<=0 || up<=0)\r
- {\r
-  puts("Illegal value of LAN or WAN bandwidth: 0 kbps.");\r
-  reject_config_and_exit(config_filename);\r
- }\r

 }\r
 \r
  \r
 }\r
 \r
  \r


@@ -418,7 +398,7 @@ void iptables_save_line(char *line, int ipv6)
 void run_iptables_restore(void)\r
 {\r
  char *restor;\r
 void run_iptables_restore(void)\r
 {\r
  char *restor;\r

- string(restor,STRLEN);\r
+ string(restor, STRLEN);\r

 \r
  /*-----------------------------------------------------------------*/\r
  printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);\r
 \r
  /*-----------------------------------------------------------------*/\r
  printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);\r


@@ -487,7 +467,6 @@ program
  int run           = FALSE;\r
  int total         = 0;\r
  \r
  int run           = FALSE;\r
  int total         = 0;\r
  \r

- char *chain_forward, *chain_postrouting;\r

  char *althosts=NULL;\r
   \r
  printf("\n\\r
  char *althosts=NULL;\r
   \r
  printf("\n\\r


@@ -532,6 +511,58 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  printf("Parsing configuration file %s ...\n", config);\r
  /*-----------------------------------------------------------------*/\r
  get_config(config);\r
  printf("Parsing configuration file %s ...\n", config);\r
  /*-----------------------------------------------------------------*/\r
  get_config(config);\r

+ /*-----------------------------------------------------------------*/\r
+ printf("Parsing upstream interfaces list %s ...\n", upstreamfile);\r
+ /*-----------------------------------------------------------------*/\r
+ parse(upstreamfile)\r
+ {\r
+  ptr = parse_datafile_line(_);\r
+  if(ptr)\r
+  {\r
+   create(interface, Interface);\r
+   interface->name = _;\r
+   interface->speed = (long long)atol(ptr);\r
+   /* is supplied value meaningful ?*/\r
+   if(interface->speed <= 0)\r
+   {\r
+    printf("Illegal value of %s interface bandwidth.\n", interface->name);\r
+    reject_config_and_exit(upstreamfile);\r
+   }\r
+   interface->is_upstream = TRUE;\r
+   interface->chain = "FORWARD";\r
+   interface->idxprefix = "forw";\r
+   push(interface, interfaces);\r
+   printf("Upstream interface %s: medium %s capacity %ld kbps\n", interface->name, medium, interface->speed);\r
+  }\r
+ }\r
+ done; /* ugly macro end */\r
+\r
+ /*-----------------------------------------------------------------*/\r
+ printf("Parsing downstream interfaces list %s ...\n", downstreamfile);\r
+ /*-----------------------------------------------------------------*/\r
+ parse(upstreamfile)\r
+ {\r
+  ptr = parse_datafile_line(_);\r
+  if(ptr)\r
+  {\r
+   create(interface, Interface);\r
+   interface->name = _;\r
+   interface->speed = (long long)atol(ptr);\r
+   /* is supplied value meaningful ?*/\r
+   if(interface->speed <= 0)\r
+   {\r
+    printf("Illegal value of %s interface bandwidth.\n", interface->name);\r
+    reject_config_and_exit(downstreamfile);\r
+   }\r
+   interface->is_upstream = FALSE;\r
+   interface->chain = "POSTROUTING";\r
+   interface->idxprefix = "post";\r
+   push(interface, interfaces);\r
+   printf("Upstream interface %s: medium %s capacity %ld kbps\n", interface->name, medium, interface->speed);\r
+  }\r
+ }\r
+ done; /* ugly macro end */\r
+\r

  \r
  if(just_logs)\r
  {\r
  \r
  if(just_logs)\r
  {\r


@@ -587,15 +618,20 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  }\r
  done; /* ugly macro end */\r
 \r
  }\r
  done; /* ugly macro end */\r
 \r

+\r
+\r

  /*-----------------------------------------------------------------*/\r
  printf("Parsing class defintion file %s ...\n", hosts);\r
  /*-----------------------------------------------------------------*/\r
  parse_hosts(hosts);\r
  /*-----------------------------------------------------------------*/\r
  printf("Parsing class defintion file %s ...\n", hosts);\r
  /*-----------------------------------------------------------------*/\r
  parse_hosts(hosts);\r

+/*\r
+ //this was pretty dumb idea anyway...\r

  if(just_networks)\r
  {\r
   analyse_topology("/usr/sbin/traceroute -n -m 10 -w 2 %s.%d");\r
   exit(-1); \r
  }\r
  if(just_networks)\r
  {\r
   analyse_topology("/usr/sbin/traceroute -n -m 10 -w 2 %s.%d");\r
   exit(-1); \r
  }\r

+*/\r

 \r
  /*-----------------------------------------------------------------*/\r
  puts("Resolving shared connections ...");\r
 \r
  /*-----------------------------------------------------------------*/\r
  puts("Resolving shared connections ...");\r


@@ -692,11 +728,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     exit(-1);\r
   }  \r
   \r
     exit(-1);\r
   }  \r
   \r

-  sprintf(str,"%s qdisc del dev %s root 2>/dev/null",tc,lan);\r
-  safe_run(str);\r
-\r
-  sprintf(str,"%s qdisc del dev %s root 2>/dev/null",tc,wan);\r
-  safe_run(str);\r
+  for_each(interface, interfaces)\r
+  {\r
+   sprintf(str,"%s qdisc del dev %s root 2>/dev/null", tc, interface->name);\r
+   safe_run(str);\r
+  }\r

   \r
   iptables_file=fopen(iptablesfile,"w");\r
   iptables_save_line(iptablespreamble, FALSE);\r
   \r
   iptables_file=fopen(iptablesfile,"w");\r
   iptables_save_line(iptablespreamble, FALSE);\r


@@ -709,33 +745,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 \r
   if(qos_free_zone && *qos_free_zone!='0') /* this is currently supported only for IPv4 */\r
   {\r
 \r
   if(qos_free_zone && *qos_free_zone!='0') /* this is currently supported only for IPv4 */\r
   {\r

-   char *chain;\r
-   \r
-   sprintf(str,"-A FORWARD -d %s -o %s -j ACCEPT", qos_free_zone, wan);\r
-   iptables_save_line(str, FALSE); /* this is currently supported only for IPv4 */\r
-   \r
-/*\r
-   if(qos_proxy)\r
+   for_each(interface, interfaces)\r

    {\r
    {\r

-    iptables_save_line(":post_noproxy - [0:0]", FALSE);\r
-    sprintf(str,"-A POSTROUTING ! -p tcp -o %s -j post_noproxy", lan);\r
-    iptables_save_line(str , FALSE);\r
-    sprintf(str,"-A POSTROUTING ! -s %s -o %s -j post_noproxy", proxy_ip, lan);\r
+    sprintf(str,"-A %s -s %s -o %s -j ACCEPT", interface->chain, qos_free_zone, interface->name);\r

     iptables_save_line(str, FALSE);\r
     iptables_save_line(str, FALSE);\r

-    sprintf(str,"-A POSTROUTING -s %s -p tcp ! --sport %d -o %s -j post_noproxy", proxy_ip, proxy_port, lan);\r
-    iptables_save_line(str, FALSE);\r
-\r
-    chain="post_noproxy";    \r

    }\r
    }\r

-\r
-   else\r
-   {\r
-*/\r
-   chain = "POSTROUTING";\r
-//   }\r
-    \r
-   sprintf(str,"-A %s -s %s -o %s -j ACCEPT", chain, qos_free_zone, lan);\r
-   iptables_save_line(str, FALSE);\r

   }\r
   \r
   if(ip_count > idxtable_treshold1 && !just_flush)\r
   }\r
   \r
   if(ip_count > idxtable_treshold1 && !just_flush)\r


@@ -824,7 +838,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    sort(idx,idxs,order_by,bitmask);\r
 \r
    i=0;\r
    sort(idx,idxs,order_by,bitmask);\r
 \r
    i=0;\r

-   for_each(idx,idxs)\r
+   for_each(idx, idxs)\r

    {\r
     if(idx->ipv6)\r
     {\r
    {\r
     if(idx->ipv6)\r
     {\r


@@ -842,53 +856,36 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     sprintf(str,":forw_%s - [0:0]", idx->id);\r
     iptables_save_line(str, idx->ipv6);\r
 \r
     sprintf(str,":forw_%s - [0:0]", idx->id);\r
     iptables_save_line(str, idx->ipv6);\r
 \r

-    if(idx->parent)\r
-    {\r
-     string(buf,strlen(idx->parent->id)+6);\r
-     sprintf(buf,"post_%s", idx->parent->id);\r
-    }\r
-    else\r
+    for_each(interface, interfaces)\r

     {\r
     {\r

-     buf="POSTROUTING";\r
-    }\r
+     if(idx->parent)\r
+     {\r
+      string(buf, strlen(idx->parent->id)+6);\r
+      sprintf(buf, "%s_%s", interface->idxprefix, idx->parent->id);\r
+     }\r
+     else\r
+     {\r
+      buf = interface->chain;\r
+     }\r

 \r
 \r

-    sprintf(str,"-A %s -d %s/%d -o %s -j post_%s", buf, subnet, idx->bitmask, lan, idx->id);\r
-    iptables_save_line(str, idx->ipv6);\r
+     sprintf(str,"-A %s -d %s/%d -o %s -j %s_%s", buf, subnet, idx->bitmask, interface->name, interface->idxprefix, idx->id);\r
+     iptables_save_line(str, idx->ipv6);\r

 \r
 \r

-    sprintf(str,"-A %s -d %s/%d -o %s -j post_common", buf, subnet, idx->bitmask, lan);\r
-    iptables_save_line(str, idx->ipv6);\r
-\r
-    if(idx->parent)\r
-    {\r
-     string(buf,strlen(idx->parent->id)+6);\r
-     sprintf(buf,"forw_%s",idx->parent->id);\r
-    }\r
-    else\r
-    {\r
-     buf="FORWARD";\r
+     sprintf(str,"-A %s -d %s/%d -o %s -j %s_common", buf, subnet, idx->bitmask, interface->name, interface->idxprefix);\r
+     iptables_save_line(str, idx->ipv6);\r

     }\r
     }\r

-\r
-    sprintf(str,"-A %s -s %s/%d -o %s -j forw_%s", buf, subnet, idx->bitmask, wan, idx->id);\r
-    iptables_save_line(str, idx->ipv6);\r
-\r
-    sprintf(str,"-A %s -s %s/%d -o %s -j forw_common", buf, subnet, idx->bitmask, wan);\r
-    iptables_save_line(str, idx->ipv6);\r

    }\r
    printf("Total indexed iptables chains created: %d\n", i);\r
 \r
    }\r
    printf("Total indexed iptables chains created: %d\n", i);\r
 \r

-   sprintf(str,"-A FORWARD -o %s -j forw_common", wan);\r
-   iptables_save_line(str, FALSE);\r
-   \r
-   sprintf(str,"-A POSTROUTING -o %s -j post_common", lan);\r
-   iptables_save_line(str, FALSE);\r
-\r
-   if(ip6prefix)\r
+   for_each(interface, interfaces)\r

    {\r
    {\r

-    sprintf(str,"-A FORWARD -o %s -j forw_common", wan);\r
-    iptables_save_line(str, TRUE);\r
-    \r
-    sprintf(str,"-A POSTROUTING -o %s -j post_common", lan);\r
-    iptables_save_line(str, TRUE);\r
+    sprintf(str,"-A %s -o %s -j %s_common", interface->chain, interface->name, interface->idxprefix);\r
+    iptables_save_line(str, FALSE);\r
+    if(ip6prefix)\r
+    {\r
+     sprintf(str,"-A %s -o %s -j %s_common", interface->chain, interface->name, interface->idxprefix);\r
+     iptables_save_line(str, TRUE);\r
+    }\r

    }\r
   }\r
  }\r
    }\r
   }\r
  }\r


@@ -908,32 +905,24 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  {\r
   if(!dry_run && !nodelay && qos_free_delay)\r
   {\r
  {\r
   if(!dry_run && !nodelay && qos_free_delay)\r
   {\r

-   printf("Flushed iptables and tc classes - now sleeping for %d seconds...\n",qos_free_delay);\r
+   printf("Flushed iptables and tc classes - now sleeping for %d seconds...\n", qos_free_delay);\r

    sleep(qos_free_delay);\r
   }\r
 \r
    sleep(qos_free_delay);\r
   }\r
 \r

-  sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",\r
-              tc,lan,htb_r2q);\r
-  safe_run(str);\r
-\r
-  sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d",\r
-               tc,lan,lan_medium,lan_medium,burst_main,highest_priority);\r
-  safe_run(str);\r
-\r
-  sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d",\r
-                tc,lan,line,line,burst_main,highest_priority);\r
-  safe_run(str);\r
-\r
-  sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",tc,wan,htb_r2q);\r
-  safe_run(str);\r
+  for_each(interface, interfaces)\r
+  {\r
+   sprintf(str, "%s qdisc add dev %s root handle 1: htb r2q %d default 1",\r
+                tc, interface->name, htb_r2q);\r
+   safe_run(str);\r

 \r
 \r

-  sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d",\r
-               tc,wan,wan_medium,wan_medium,burst_main,highest_priority);\r
-  safe_run(str);\r
+   sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d",\r
+                tc, interface->name, medium, medium, burst_main, highest_priority);\r
+   safe_run(str);\r

 \r
 \r

-  sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d",\r
-               tc,wan,up,up,burst_main,highest_priority);\r
-  safe_run(str);\r
+   sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d",\r
+                tc, interface->name, interface->speed, interface->speed, burst_main, highest_priority);\r
+   safe_run(str);\r
+  }\r

  }\r
 \r
  /*-----------------------------------------------------------------*/\r
  }\r
 \r
  /*-----------------------------------------------------------------*/\r


@@ -942,38 +931,32 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  sort(ip,ips,desc_order_by,traffic); \r
 \r
  /*-----------------------------------------------------------------*/\r
  sort(ip,ips,desc_order_by,traffic); \r
 \r
  /*-----------------------------------------------------------------*/\r

- /* sub-scope - local variables */  \r
+ for_each(interface, interfaces)\r

  {\r
  {\r

-  long long int rate = line;\r
-  long long int max = line;\r
+  long long int rate = interface->speed;\r
+  long long int max = interface->speed;\r

   int group_count = 0;\r
   int group_count = 0;\r

-  FILE *credit_file = NULL;\r
+ //obsolete: FILE *credit_file = NULL;\r

   \r
   \r

-  if(!just_preview && !dry_run && enable_credit)\r
-  {\r
-   credit_file = fopen(credit,"w");\r
-  }\r
-    \r
+ //obsolete:  if(!just_preview && !dry_run && enable_credit)\r
+ //obsolete:  {\r
+ //obsolete:   credit_file = fopen(credit,"w");\r
+ //obsolete:  }\r
+\r

   for_each(group,groups)\r
   {\r
    if(!just_preview)\r
    {\r
   for_each(group,groups)\r
   {\r
    if(!just_preview)\r
    {\r

-    //download\r
-    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", \r
-                 tc, lan, parent, group->id, rate, max, burst_group, highest_priority+1, group->desired);\r
-    safe_run(str);\r
-    \r
-    //upload\r
-    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", \r
-                 tc, wan, parent, group->id, rate*up/line, max*up/line, burst_group, highest_priority+1, group->desired);\r
+    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", \r
+                  tc, interface->name, parent, group->id, rate, max, burst_group, highest_priority+1, group->desired);\r

     safe_run(str);\r
    }\r
     safe_run(str);\r
    }\r

-   \r
+\r

    if(group_count++ < max_nesting)\r
    {\r
     parent = group->id;\r
    }\r
    if(group_count++ < max_nesting)\r
    {\r
     parent = group->id;\r
    }\r

-   \r
+\r

    rate -= digital_divide*group->min;\r
    if(rate < group->min)\r
    {\r
    rate -= digital_divide*group->min;\r
    if(rate < group->min)\r
    {\r


@@ -981,6 +964,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    }\r
     \r
    /*shaping of aggresive downloaders, with credit file support */\r
    }\r
     \r
    /*shaping of aggresive downloaders, with credit file support */\r

+   /* obsolete\r

    if(use_credit)\r
    {\r
     int group_rate = group->min, priority_sequence = lowest_priority;\r
    if(use_credit)\r
    {\r
     int group_rate = group->min, priority_sequence = lowest_priority;\r


@@ -1028,12 +1012,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
       }\r
      }\r
     }        \r
       }\r
      }\r
     }        \r

-   }\r
+   } obsolete */\r

   }\r
   }\r

+  /* obsolete \r

   if(credit_file)\r
   {\r
    fclose(credit_file);\r
   if(credit_file)\r
   {\r
    fclose(credit_file);\r

-  }\r
+  } obsolete */\r

  }\r
 \r
  if(just_preview)\r
  }\r
 \r
  if(just_preview)\r


@@ -1120,7 +1105,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
        }\r
        else\r
        {\r
        }\r
        else\r
        {\r

-        printf("Applying limit for %s (%s) ", ip->name, ip->addr);\r
+        printf("Updating %s (%s) ", ip->name, ip->addr);\r

         if(reduce_ceil)\r
         {\r
          ip->max = ip->min + (ip->desired-ip->min)/reduce_ceil;\r
         if(reduce_ceil)\r
         {\r
          ip->max = ip->min + (ip->desired-ip->min)/reduce_ceil;\r


@@ -1130,24 +1115,37 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
          ip->max = ip->min;\r
         }        \r
        }\r
          ip->max = ip->min;\r
         }        \r
        }\r

-       if(print_stats)\r
+       for_each(interface, interfaces)\r

        {\r
        {\r

-        printf("(down: %dk-%dk wants %dk, ", ip->min, ip->max, ip->desired);\r
+        if(!interface->is_upstream)\r
+        {\r
+         if(print_stats)\r
+         {\r
+          printf("[down %s: %dk-%dk wants %d]", interface->name, ip->min, ip->max, ip->desired);\r
+         }\r
+         sprintf(str, "%s class change dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", \r
+                      tc, interface->name, ip->group, ip->mark, ip->min, ip->max, burst, ip->prio);\r
+         safe_run(str);\r
+        }\r
+        else\r
+        {\r
+         if(print_stats)\r
+         {\r
+          printf("[up %s: %dk-%dk wants %dk]", interface->name, (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), \r
+                                             (int)((ip->desired/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),\r
+                                             (int)((ip->desired/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed));\r
+         }\r
+         sprintf(str,"%s class change dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
+                      tc, interface->name, ip->group, ip->mark,\r
+                      (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),\r
+                      (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio);\r
+         safe_run(str);\r
+        }\r

        }\r
        }\r

-       sprintf(str, "%s class change dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", \r
-                    tc, lan, ip->group, ip->mark,ip->min,ip->max, burst, ip->prio);\r
-       safe_run(str);\r

        if(print_stats)\r
        {\r
        if(print_stats)\r
        {\r

-        printf("up: %dk-%dk wants %dk)\n", (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), \r
-                                           (int)((ip->desired/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),\r
-                                           (int)((ip->desired/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed));\r
+        printf("\n");\r

        }\r
        }\r

-       sprintf(str,"%s class change dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
-                    tc, wan, ip->group, ip->mark,\r
-                    (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),\r
-                    (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio);\r
-       safe_run(str);\r

       }\r
      }\r
     }\r
       }\r
      }\r
     }\r


@@ -1214,266 +1212,172 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  printf(" + generating iptables and tc classes ... ");\r
  /*-----------------------------------------------------------------*/\r
 \r
  printf(" + generating iptables and tc classes ... ");\r
  /*-----------------------------------------------------------------*/\r
 \r

- for_each(ip, ips) if(ip->mark > 0) /* works only for IPv4 so far */\r
+ for_each(ip, ips) if(ip->mark > 0)\r

  {\r
  {\r

-  if(idxs)\r
+  for_each(interface, interfaces)\r

   {\r
   {\r

-   char *buf;\r
-   duplicate(ip->addr,buf);\r
-   if(ip->v6)\r
+   char *chain;\r
+   if(idxs)\r

    {\r
    {\r

-    buf=index6_id(ip->addr,64-idxtable_bitmask1);\r
+    char *buf;\r
+    duplicate(ip->addr,buf);\r
+    if(ip->v6)\r
+    {\r
+     buf=index6_id(ip->addr,64-idxtable_bitmask1);\r
+    }\r
+    else\r
+    {\r
+     buf=index_id(ip->addr,32-idxtable_bitmask1);\r
+    }\r
+    \r
+    string(chain, 6+strlen(buf));\r
+    sprintf(chain, "%s_", interface->idxprefix);\r
+    strcat(chain, buf);\r
+\r
+    free(buf);\r

    }\r
    else\r
    {\r
    }\r
    else\r
    {\r

-    buf=index_id(ip->addr,32-idxtable_bitmask1);\r
+    chain = interface->chain;\r

    }\r
    }\r

-   \r
-   string(chain_forward,6+strlen(buf));\r
-   strcpy(chain_forward,"forw_");\r
-   strcat(chain_forward,buf);\r

 \r
 \r

-   string(chain_postrouting,6+strlen(buf));\r
-   strcpy(chain_postrouting,"post_");\r
-   strcat(chain_postrouting,buf);\r
-   \r
-   free(buf);\r
-  }\r
-  else\r
-  {\r
-   chain_forward="FORWARD";\r
-   chain_postrouting="POSTROUTING";\r
-  }\r
+   /* packet limits - this will be optional in future */\r
+   if(ip->pps_limit)\r
+   {\r
+    sprintf(limit_pkts, "-m limit --limit %d/s --limit-burst %d ", \r
+                        ip->pps_limit, ip->pps_limit);\r
+   }\r
+   else\r
+   {\r
+    *limit_pkts = 0;\r
+   }  \r

 \r
 \r

-  /* packet limits - this will be optional in future */\r
-  if(ip->pps_limit)\r
-  {\r
-   sprintf(limit_pkts, "-m limit --limit %d/s --limit-burst %d ", \r
-                       ip->pps_limit, ip->pps_limit);\r
-  }\r
-  else\r
-  {\r
-   *limit_pkts = 0;\r
-  }  \r
+ #ifdef DEBUG\r
+   printf("%-22s %-16s %04d %d/s\n", ip->name, ip->addr, ip->mark, ip->pps_limit); \r
+ #endif\r

 \r
 \r

-#ifdef DEBUG\r
-  printf("%-22s %-16s %04d %d/s\n", ip->name, ip->addr, ip->mark, ip->pps_limit); \r
-#endif\r
+   /* ------------------------------------------------ iptables classify */\r
+   sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",\r
+                chain, ip->addr, ip->mask,\r
+                interface->name, mark_iptables, ip->mark);\r
+   iptables_save_line(str, ip->v6);\r

 \r
 \r

-  /* -------------------------------------------------------- mark download */  \r
-  sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",\r
-               chain_postrouting, ip->addr, ip->mask,\r
-               lan, mark_iptables, ip->mark);\r
-  iptables_save_line(str, ip->v6);\r
+   sprintf(str, "-A %s -d %s/%d -o %s %s-j ACCEPT",\r
+                chain, ip->addr, ip->mask, interface->name, limit_pkts);\r
+   iptables_save_line(str, ip->v6);\r

 \r
 \r

-/*\r
-  if(qos_proxy)\r
-  {\r
-   sprintf(str, "-A %s -s %s -p tcp --sport %d -d %s/%d -o %s -j %s%d",\r
-                chain_postrouting, proxy_ip, proxy_port, ip->addr,\r
-                ip->mask, lan, mark_iptables, ip->mark);\r
+   /* classify overlimit packets to separate overlimit class */\r
+   sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",\r
+                chain, ip->addr, ip->mask,\r
+                interface->name, mark_iptables, OVERLIMIT_CLASS);\r

    iptables_save_line(str, ip->v6);\r
    iptables_save_line(str, ip->v6);\r

-  }\r
-*/\r
-  sprintf(str, "-A %s -d %s/%d -o %s %s-j ACCEPT",\r
-               chain_postrouting, ip->addr, ip->mask, lan, limit_pkts);\r
-  iptables_save_line(str, ip->v6);\r
-\r
-  /* classify overlimit packets to separate overlimit class */\r
-  sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",\r
-               chain_postrouting, ip->addr, ip->mask,\r
-               lan, mark_iptables, OVERLIMIT_CLASS);\r
-  iptables_save_line(str, ip->v6);\r
-\r
-  sprintf(str, "-A %s -d %s/%d -o %s -j ACCEPT",\r
-               chain_postrouting, ip->addr, ip->mask, lan);\r
-  iptables_save_line(str, ip->v6);\r
-\r
-  /* -------------------------------------------------------- mark upload */\r
-  sprintf(str, "-A %s -s %s/%d -o %s -j %s%d", \r
-               chain_forward, ip->addr, ip->mask, wan, mark_iptables, ip->mark);\r
-  iptables_save_line(str, ip->v6);\r
-\r
-  sprintf(str, "-A %s -s %s/%d -o %s %s-j ACCEPT",\r
-               chain_forward, ip->addr, ip->mask, wan, limit_pkts);\r
-  iptables_save_line(str, ip->v6);\r
-\r
-  /* classify overlimit packets to separate overlimit class */\r
-  sprintf(str, "-A %s -s %s/%d -o %s -j %s%d", \r
-               chain_forward, ip->addr, ip->mask, wan, mark_iptables, OVERLIMIT_CLASS);\r
-  iptables_save_line(str, ip->v6);\r
-\r
-  sprintf(str, "-A %s -s %s/%d -o %s -j ACCEPT",\r
-               chain_forward, ip->addr, ip->mask, wan);\r
-  iptables_save_line(str, ip->v6);\r
-\r
-  if(ip->min)\r
-  {\r
-   /* -------------------------------------------------------- download class */\r
-#ifdef DEBUG\r
-   printf("(down: %dk-%dk ", ip->min, ip->max); \r
-#endif\r

 \r
 \r

-   sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", \r
-                tc, lan, ip->group, ip->mark, ip->min, ip->max, burst, ip->prio);\r
-   safe_run(str);\r
+   sprintf(str, "-A %s -d %s/%d -o %s -j ACCEPT",\r
+                chain, ip->addr, ip->mask, interface->name);\r
+   iptables_save_line(str, ip->v6);\r

 \r
 \r

-   if(strcmpi(ip->keyword->leaf_discipline, "none"))\r
+   if(ip->min)\r

    {\r
    {\r

-    sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s", \r
-                 tc, lan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
-    safe_run(str);\r
-   }\r
+    //TODO - min and max should not exceed interface->speed\r
+   \r
+    /* -------------------------------------------------------- tc class */\r
+ #ifdef DEBUG\r
+    printf("[down: %dk-%dk]", ip->min, ip->max);\r
+ #endif\r

 \r
 \r

-   if(filter_type == 1)\r
-   {\r
-    sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",\r
-                 tc, lan, ip->mark, ip->mark);\r
+    sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", \r
+                 tc, interface->name, ip->group, ip->mark, ip->min, ip->max, burst, ip->prio);\r

     safe_run(str);\r
     safe_run(str);\r

-   }\r

 \r
 \r

-   /* -------------------------------------------------------- upload class */\r
-#ifdef DEBUG\r
-   printf("up: %dk-%dk)\n", (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), \r
-                            (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed));\r
-#endif\r
-\r
-   sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
-                tc, wan, ip->group, ip->mark,\r
-                (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),\r
-                (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio);\r
-   safe_run(str);\r
-   \r
-   if(strcmpi(ip->keyword->leaf_discipline, "none"))\r
-   {\r
-    sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s",\r
-                 tc, wan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
-    safe_run(str);\r
-   }   \r
+    if(strcmpi(ip->keyword->leaf_discipline, "none"))\r
+    {\r
+     sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s", \r
+                  tc, interface->name, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
+     safe_run(str);\r
+    }\r

 \r
 \r

-   if(filter_type == 1)\r
-   {\r
-    sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",\r
-                 tc, wan, ip->mark, ip->mark);\r
-    safe_run(str);\r
+    if(filter_type == 1)\r
+    {\r
+     sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",\r
+                  tc, interface->name, ip->mark, ip->mark);\r
+     safe_run(str);\r
+    }\r

    }\r
    }\r

-  \r
-   if(f > 0)\r
+   else\r

    {\r
    {\r

-    fprintf(f, "%s %d\n", ip->addr, ip->mark);\r
+ #ifdef DEBUG\r
+    printf("(sharing %s)\n", ip->sharing);\r
+ #endif\r

    }\r
    }\r

+   i++;\r

   }\r
   }\r

-  else\r
+  if(ip->min && f > 0)\r

   {\r
   {\r

-#ifdef DEBUG\r
-   printf("(sharing %s)\n", ip->sharing);\r
-#endif\r
+   fprintf(f, "%s %d\n", ip->addr, ip->mark);\r

   }\r
   }\r

-  i++;\r

  }\r
  if(f > 0)\r
  {\r
   puts("done.");\r
   fclose(f);\r
  }\r
  }\r
  if(f > 0)\r
  {\r
   puts("done.");\r
   fclose(f);\r
  }\r

- \r
- if(idxs)\r
- {\r
-  chain_forward = "forw_common";\r
-  chain_postrouting = "post_common";\r
- }\r
- else\r
- {\r
-  chain_forward = "FORWARD";\r
-  chain_postrouting = "POSTROUTING";\r
- }\r

 \r
 \r

- if(free_min)\r
+ for_each(interface, interfaces)\r

  {\r
  {\r

-  final_chain = "ACCEPT";\r
- }\r
-\r
-/*\r
- if(qos_proxy)\r
- {\r
-  if(free_min) \r
+  char *chain;\r
+  if(idxs)\r

   {\r
   {\r

-   sprintf(str, "-A %s -s %s -p tcp --sport %d -o %s -j %s%d",\r
-                chain_postrouting,proxy_ip,proxy_port,lan,mark_iptables, 3);\r
-   iptables_save_line(str, FALSE); // only for IPv4\r
+   string(chain, STRLEN);\r
+   sprintf(chain, "%s_common", interface->idxprefix);\r
+  }\r
+  else\r
+  {\r
+   chain = interface->chain;\r

   }\r
   }\r

-  sprintf(str, "-A %s -s %s -p tcp --sport %d -o %s -j %s",\r
-               chain_postrouting,proxy_ip,proxy_port,lan,final_chain);\r
-  iptables_save_line(str, FALSE); // only for IPv4\r
- }\r
-*/\r
-\r
- if(free_min)\r
- {\r
-  sprintf(str, "-A %s -o %s -j %s%d",\r
-               chain_postrouting, lan, mark_iptables, FREE_CLASS);\r
-  iptables_save_line(str, FALSE); /* only for IPv4 */\r
- }\r

 \r
 \r

- sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);\r
- iptables_save_line(str, FALSE);\r
- if(ip6prefix)\r
- {\r
-  sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);\r
-  iptables_save_line(str, TRUE);\r
- }\r
+  if(free_min)\r
+  {\r
+   final_chain = "ACCEPT";\r

 \r
 \r

- if(free_min)\r
- {\r
-  sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, FREE_CLASS);\r
-  iptables_save_line(str, FALSE); /* only for IPv4 */\r
- }\r
+   sprintf(str, "-A %s -o %s -j %s%d",\r
+                chain, interface->name, mark_iptables, FREE_CLASS);\r
+   iptables_save_line(str, FALSE); /* only for IPv4 */\r
+  }\r

 \r
 \r

- sprintf(str,"-A %s -o %s -j %s", chain_forward, wan, final_chain);\r
- iptables_save_line(str, FALSE);\r
- if(ip6prefix)\r
- {\r
-  sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);\r
-  iptables_save_line(str, TRUE);\r
- }\r
+  sprintf(str,"-A %s -o %s -j %s", chain, interface->name, final_chain);\r
+  iptables_save_line(str, FALSE);\r
+  if(ip6prefix)\r
+  {\r
+   sprintf(str,"-A %s -o %s -j %s", chain, interface->name, final_chain);\r
+   iptables_save_line(str, TRUE);\r
+  }\r

 \r
 \r

- if(free_min) /* allocate free bandwith if it is not zero... */ \r
- {\r
+  if(free_min) /* allocate free bandwith if it is not zero... */ \r
+  {\r

    /*-----------------------------------------------------------------*/\r
    puts("Generating free bandwith class ...");\r
    /*-----------------------------------------------------------------*/\r
    sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
    /*-----------------------------------------------------------------*/\r
    puts("Generating free bandwith class ...");\r
    /*-----------------------------------------------------------------*/\r
    sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r

-                tc, lan, parent, FREE_CLASS, free_min, free_max,burst, lowest_priority);\r
-   safe_run(str);\r
-   sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
-                tc, wan, parent, FREE_CLASS, free_min, free_max, burst, lowest_priority);\r
+                tc, interface->name, parent, FREE_CLASS, free_min, free_max,burst, lowest_priority);\r

    safe_run(str);\r
    /* tc SFQ */\r
    if(strcmpi(qos_leaf, "none"))\r
    {\r
    safe_run(str);\r
    /* tc SFQ */\r
    if(strcmpi(qos_leaf, "none"))\r
    {\r

-     sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, lan, FREE_CLASS, FREE_CLASS, qos_leaf);\r
-     safe_run(str);\r
-   \r
-     sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, wan, FREE_CLASS, FREE_CLASS, qos_leaf);\r
+     sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, interface->name, FREE_CLASS, FREE_CLASS, qos_leaf);\r

      safe_run(str);\r
    }   \r
    /* tc handle 1 fw flowid */\r
      safe_run(str);\r
    }   \r
    /* tc handle 1 fw flowid */\r

-   sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, lan, FREE_CLASS, FREE_CLASS);\r
-   safe_run(str);\r
-\r
-   sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, wan, FREE_CLASS, FREE_CLASS);\r
+   sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, interface->name, FREE_CLASS, FREE_CLASS);\r

    safe_run(str);\r
 \r
    /*-----------------------------------------------------------------*/\r
    puts("Generating bandwith class for overlimit packets...");\r
    /*-----------------------------------------------------------------*/\r
    sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
    safe_run(str);\r
 \r
    /*-----------------------------------------------------------------*/\r
    puts("Generating bandwith class for overlimit packets...");\r
    /*-----------------------------------------------------------------*/\r
    sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r

-                tc, lan, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority);\r
-   safe_run(str);\r
-   sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
-                tc, wan, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority);\r
+                tc, interface->name, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority);\r

    safe_run(str);\r
    safe_run(str);\r

- }\r
+  }\r
+ } \r

  printf("Total IP count: %d\n", i);\r
  run_iptables_restore();\r
  if(log_file)\r
  printf("Total IP count: %d\n", i);\r
  run_iptables_restore();\r
  if(log_file)\r