X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=prometheus.c;h=992e6bd6396fca31f3ac9de4e953cb5f6a07f111;hb=1a2ab32b216e382f5b24e019baa71493f356fb08;hp=d25ca51aa89b3baa0e9b62c193a56b141c937956;hpb=9f552e96b7c3ed1b5af6578252c0154491132a10;p=svn%2FPrometheus-QoS%2F.git

diff --git a/prometheus.c b/prometheus.c
index d25ca51..992e6bd 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -2,7 +2,7 @@
 /* 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-2015 Michael Polak, Arachne Aerospace     */
+/* Copyright(C) 2005-2017 Michael Polak, Arachne Aerospace     */
 /* iptables-restore support Copyright(C) 2007-2008 ludva       */
 /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
@@ -290,7 +290,7 @@ void get_config(char *config_filename)
   option("hosts",hosts);
   option("downstream-interfaces-list-filename",downstreamfile);
   option("upstream-interfaces-list-filename",upstreamfile);
-  option("macros-filename",upstreamfile);
+  option("macros-filename",macrosfile);
   option("ip6-prefix",ip6prefix);
   option("medium",medium);
   ioption("hall-of-fame-enable",hall_of_fame);
@@ -395,6 +395,10 @@ void iptables_save_line(char *line, int ipv6)
  }
 }
 
+#define IPv4 FALSE
+#define IPv6 TRUE
+
+
 void run_iptables_restore(void)
 {
  char *restor;
@@ -404,7 +408,7 @@ void run_iptables_restore(void)
  printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);
  /*-----------------------------------------------------------------*/
 
- iptables_save_line("COMMIT", FALSE);
+ iptables_save_line("COMMIT", IPv4);
  fclose(iptables_file);
  if(dry_run) 
  {
@@ -423,7 +427,7 @@ void run_iptables_restore(void)
   /*-----------------------------------------------------------------*/
   printf("Running %s <%s ...\n", ip6tablesrestore, ip6tablesfile);
   /*-----------------------------------------------------------------*/
-  iptables_save_line("COMMIT", TRUE);
+  iptables_save_line("COMMIT", IPv6);
   fclose(ip6tables_file);
   if(dry_run) 
   {
@@ -471,7 +475,7 @@ program
   
  printf("\n\
 Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\
-Version %s - Copyright (C)2005-2015 Michael Polak, Arachne Labs\n\
+Version %s - Copyright (C)2005-2017 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);
 
@@ -540,7 +544,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  /*-----------------------------------------------------------------*/
  printf("Parsing downstream interfaces list %s ...\n", downstreamfile);
  /*-----------------------------------------------------------------*/
- parse(upstreamfile)
+ parse(downstreamfile)
  {
   ptr = parse_datafile_line(_);
   if(ptr)
@@ -558,7 +562,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    interface->chain = "POSTROUTING";
    interface->idxprefix = "post";
    push(interface, interfaces);
-   printf("Upstream interface %s: medium %s capacity %ld kbps\n", interface->name, medium, interface->speed);
+   printf("Downstream interface %s: medium %s capacity %ld kbps\n", interface->name, medium, interface->speed);
   }
  }
  done; /* ugly macro end */
@@ -705,7 +709,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     perror(iptablesfile);
     exit(-1);
   }
-  iptables_save_line(iptablespreamble, FALSE);
+  iptables_save_line(iptablespreamble, IPv4);
 
   if(ip6prefix)
   {
@@ -715,8 +719,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      perror(ip6tablesfile);
      exit(-1);
    }
-   iptables_save_line(iptablespreamble, TRUE);
-   iptables_save_line(ip6preamble, TRUE);
+   iptables_save_line(iptablespreamble, IPv6);
+   iptables_save_line(ip6preamble, IPv6);
   }
 
   run_iptables_restore();
@@ -735,20 +739,20 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   }
   
   iptables_file=fopen(iptablesfile,"w");
-  iptables_save_line(iptablespreamble, FALSE);
+  iptables_save_line(iptablespreamble, IPv4);
   if(ip6prefix)
   {
    ip6tables_file=fopen(ip6tablesfile,"w");
-   iptables_save_line(iptablespreamble, TRUE);
-   iptables_save_line(ip6preamble, TRUE);
+   iptables_save_line(iptablespreamble, IPv6);
+   iptables_save_line(ip6preamble, IPv6);
   }
 
   if(qos_free_zone && *qos_free_zone!='0') /* this is currently supported only for IPv4 */
   {
    for_each(interface, interfaces)
    {
-    sprintf(str,"-A %s -s %s -o %s -j ACCEPT", interface->chain, qos_free_zone, interface->name);
-    iptables_save_line(str, FALSE);
+    sprintf(str,"-A %s -%c %s -o %s -j ACCEPT", interface->chain, (interface->is_upstream?'d':'s'), qos_free_zone, interface->name);
+    iptables_save_line(str, IPv4);
    }
   }
   
@@ -760,12 +764,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    printf("Detected %d addresses - indexing iptables rules to improve performance...\n",ip_count);
    /*-----------------------------------------------------------------*/
 
-   iptables_save_line(":post_common - [0:0]", FALSE);
-   iptables_save_line(":forw_common - [0:0]", FALSE);
+   iptables_save_line(":post_common - [0:0]", IPv4);
+   iptables_save_line(":forw_common - [0:0]", IPv4);
    if(ip6prefix)
    {
-    iptables_save_line(":post_common - [0:0]", TRUE);
-    iptables_save_line(":forw_common - [0:0]", TRUE);
+    iptables_save_line(":post_common - [0:0]", IPv6);
+    iptables_save_line(":forw_common - [0:0]", IPv6);
    }
 
    for_each(ip,ips) if(ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0")) 
@@ -868,10 +872,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
       buf = interface->chain;
      }
 
-     sprintf(str,"-A %s -d %s/%d -o %s -j %s_%s", buf, subnet, idx->bitmask, interface->name, interface->idxprefix, idx->id);
+     sprintf(str, "-A %s -%c %s/%d -o %s -j %s_%s", 
+                  buf, (interface->is_upstream?'s':'d'), subnet, idx->bitmask, interface->name, interface->idxprefix, idx->id);
      iptables_save_line(str, idx->ipv6);
 
-     sprintf(str,"-A %s -d %s/%d -o %s -j %s_common", buf, subnet, idx->bitmask, interface->name, interface->idxprefix);
+     sprintf(str, "-A %s -%c %s/%d -o %s -j %s_common",
+                  buf, (interface->is_upstream?'s':'d'), subnet, idx->bitmask, interface->name, interface->idxprefix);
      iptables_save_line(str, idx->ipv6);
     }
    }
@@ -880,11 +886,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    for_each(interface, interfaces)
    {
     sprintf(str,"-A %s -o %s -j %s_common", interface->chain, interface->name, interface->idxprefix);
-    iptables_save_line(str, FALSE);
+    iptables_save_line(str, IPv4);
     if(ip6prefix)
     {
      sprintf(str,"-A %s -o %s -j %s_common", interface->chain, interface->name, interface->idxprefix);
-     iptables_save_line(str, TRUE);
+     iptables_save_line(str, IPv6);
     }
    }
   }
@@ -1257,24 +1263,29 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  #endif
 
    /* ------------------------------------------------ iptables classify */
-   sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",
-                chain, ip->addr, ip->mask,
+   sprintf(str, "-A %s -%c %s/%d -o %s -j %s%d",
+                chain, (interface->is_upstream?'s':'d'), ip->addr, ip->mask,
                 interface->name, mark_iptables, ip->mark);
    iptables_save_line(str, ip->v6);
 
-   sprintf(str, "-A %s -d %s/%d -o %s %s-j ACCEPT",
-                chain, ip->addr, ip->mask, interface->name, limit_pkts);
+   sprintf(str, "-A %s -%c %s/%d -o %s %s-j ACCEPT",
+                chain, (interface->is_upstream?'s':'d'),ip->addr, ip->mask,
+                interface->name, limit_pkts);
    iptables_save_line(str, ip->v6);
 
-   /* classify overlimit packets to separate overlimit class */
-   sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",
-                chain, ip->addr, ip->mask,
-                interface->name, mark_iptables, OVERLIMIT_CLASS);
-   iptables_save_line(str, ip->v6);
-
-   sprintf(str, "-A %s -d %s/%d -o %s -j ACCEPT",
-                chain, ip->addr, ip->mask, interface->name);
-   iptables_save_line(str, ip->v6);
+   if(limit_pkts)
+   {
+    /* classify overlimit packets to separate overlimit class */
+    sprintf(str, "-A %s -%c %s/%d -o %s -j %s%d",
+                 chain, (interface->is_upstream?'s':'d'), ip->addr, ip->mask,
+                 interface->name, mark_iptables, OVERLIMIT_CLASS);
+    iptables_save_line(str, ip->v6);
+
+    sprintf(str, "-A %s -%c %s/%d -o %s -j ACCEPT",
+                 chain, (interface->is_upstream?'s':'d'), ip->addr, ip->mask,
+                 interface->name);
+    iptables_save_line(str, ip->v6);
+   }
 
    if(ip->min)
    {
@@ -1341,15 +1352,15 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
    sprintf(str, "-A %s -o %s -j %s%d",
                 chain, interface->name, mark_iptables, FREE_CLASS);
-   iptables_save_line(str, FALSE); /* only for IPv4 */
+   iptables_save_line(str, IPv4); /* only for IPv4 */
   }
 
   sprintf(str,"-A %s -o %s -j %s", chain, interface->name, final_chain);
-  iptables_save_line(str, FALSE);
+  iptables_save_line(str, IPv4);
   if(ip6prefix)
   {
    sprintf(str,"-A %s -o %s -j %s", chain, interface->name, final_chain);
-   iptables_save_line(str, TRUE);
+   iptables_save_line(str, IPv6);
   }
 
   if(free_min) /* allocate free bandwith if it is not zero... */ 
@@ -1369,14 +1380,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    /* tc handle 1 fw flowid */
    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);
    safe_run(str);
-
-   /*-----------------------------------------------------------------*/
-   puts("Generating bandwith class for overlimit packets...");
-   /*-----------------------------------------------------------------*/
-   sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",
-                tc, interface->name, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority);
-   safe_run(str);
   }
+  /*-----------------------------------------------------------------*/
+  puts("Generating bandwith class for overlimit packets...");
+  /*-----------------------------------------------------------------*/
+  sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",
+               tc, interface->name, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority);
+  safe_run(str);
  } 
  printf("Total IP count: %d\n", i);
  run_iptables_restore();