X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=prometheus.c;h=03b75543d8964c125fc87c03b48995d74505b162;hb=64b2d1255780905c78973df33145c93ee5613c9c;hp=252c083cdc1df8d8ea1d97096bc1b8a95e45f8d2;hpb=fa54950d31dc0d7e15e945750d4dcbaca2de613e;p=svn%2FPrometheus-QoS%2F.git

diff --git a/prometheus.c b/prometheus.c
index 252c083..03b7554 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -2,12 +2,12 @@
 /* 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     */
+/* Copyright(C) 2005-2014 Michael Polak, Arachne Aerospace     */
 /* iptables-restore support Copyright(C) 2007-2008 ludva       */
 /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-/* Modified by: xChaos, 20131126
+/* Modified by: xChaos, 20140812
                  ludva, 20080415
  
    Prometheus QoS is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
 #include "cll1-0.6.2.h"
 #include "ipstruct.h"
 
-const char *version = "0.8.5-a";
+const char *version = "0.8.5-b";
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 /* Versions: 0.8.3 is development release, 0.8.4 will be "stable"  */
@@ -40,7 +40,7 @@ const char *version = "0.8.5-a";
 /* Warning: unofficial Github mirror is not supported by author!  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-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";
+const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2014 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";
 
 #define STRLEN 512
 #undef DEBUG
@@ -258,7 +258,7 @@ void get_config(char *config_filename)
      {
       char *tmptr=_; /*  <---- l+1 ----> */
       _+=l+1;        /*  via-prometheus-asymetry-ratio, etc. */
-      ioption("asymetry-ratio", keyword->asymetry_ratio);
+      foption("asymetry-ratio", keyword->asymetry_ratio);
       ioption("asymetry-treshold", keyword->asymetry_fixed);
       ioption("magic-relative-limit", keyword->data_limit);
       ioption("magic-relative-prio", keyword->data_prio);
@@ -503,7 +503,7 @@ program
   
  printf("\n\
 Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\
-Version %s - Copyright (C)2005-2013 Michael Polak, Arachne Labs\n\
+Version %s - Copyright (C)2005-2014 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);
 
@@ -620,6 +620,23 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    ip->mark = sharedip->mark; 
    ip->lmsid = sharedip->lmsid;
    ip->pps_limit = sharedip->pps_limit; /* no other way to do this */
+
+   /* Ugly hack: append IPv4 addresses of sharedip to IPv6 uplinks */
+   ptr = strchr(ip->addr, '+');
+   if(ptr && ptr-ip->addr > 1 && !sharedip->v6)
+   {
+    *(--ptr) = 0;
+    concatenate(ip->addr, sharedip->addr, ptr);
+    ip->name = ip->addr = ptr;
+    ptr = strchr(ip->addr, '.');
+    while(ptr && *ptr)
+    {
+     *ptr = ':';
+     ptr = strchr(ptr, '.');
+    }
+    ip->mask += 64;
+   }
+
    break;
   }
   if(not sharedip)
@@ -999,8 +1016,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      {
       if(    ip->keyword->data_prio 
           && !ip->fixedprio 
-          && (   ip->traffic>ip->credit
-               + (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20))) )
+          && (   ip->traffic >   ip->credit + (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20))) )
       {
        ip->prio=priority_sequence--;
        if(ip->prio<highest_priority+1)
@@ -1184,7 +1200,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
   /* -------------------------------------------------------- mark download */  
   sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",
-               chain_postrouting, ip->addr, 32*(1+ip->v6),
+               chain_postrouting, ip->addr, ip->mask,
                lan, mark_iptables, ip->mark);
   iptables_save_line(str, ip->v6);
 
@@ -1193,40 +1209,40 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   {
    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);
+                ip->mask, lan, mark_iptables, ip->mark);
    iptables_save_line(str, ip->v6);
   }
 */
   sprintf(str, "-A %s -d %s/%d -o %s %s-j ACCEPT",
-               chain_postrouting, ip->addr, 32*(1+ip->v6), lan, limit_pkts);
+               chain_postrouting, ip->addr, ip->mask, lan, 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_postrouting, ip->addr, 32*(1+ip->v6),
+               chain_postrouting, ip->addr, ip->mask,
                lan, mark_iptables, OVERLIMIT_CLASS);
   iptables_save_line(str, ip->v6);
 
   sprintf(str, "-A %s -d %s/%d -o %s -j ACCEPT",
-               chain_postrouting, ip->addr, 32*(1+ip->v6), lan);
+               chain_postrouting, ip->addr, ip->mask, lan);
   iptables_save_line(str, ip->v6);
 
   /* -------------------------------------------------------- mark upload */
   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);
+               chain_forward, ip->addr, ip->mask, wan, mark_iptables, ip->mark);
   iptables_save_line(str, ip->v6);
 
   sprintf(str, "-A %s -s %s/%d -o %s %s-j ACCEPT",
-               chain_forward, ip->addr, 32*(1+ip->v6), wan, limit_pkts);
+               chain_forward, ip->addr, ip->mask, wan, limit_pkts);
   iptables_save_line(str, ip->v6);
 
   /* classify overlimit packets to separate overlimit class */
   sprintf(str, "-A %s -s %s/%d -o %s -j %s%d", 
-               chain_forward, ip->addr, 32*(1+ip->v6), wan, mark_iptables, OVERLIMIT_CLASS);
+               chain_forward, ip->addr, ip->mask, wan, mark_iptables, OVERLIMIT_CLASS);
   iptables_save_line(str, ip->v6);
 
   sprintf(str, "-A %s -s %s/%d -o %s -j ACCEPT",
-               chain_forward, ip->addr, 32*(1+ip->v6), wan);
+               chain_forward, ip->addr, ip->mask, wan);
   iptables_save_line(str, ip->v6);
 
   if(ip->min)