X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=prometheus.c;h=87c5f18a92487053b1d56a04ca658ce7174a7799;hb=75e8c6ab4e96499b902961d41fb90fe58df88c8b;hp=71b2a32e13c9a8188cac8dea38a67d22d0736e42;hpb=56f6397ec3e60052dce31b6417ff64572b880897;p=svn%2FPrometheus-QoS%2F.git

diff --git a/prometheus.c b/prometheus.c
index 71b2a32..87c5f18 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-2017 Michael Polak, Arachne Aerospace     */
+/* Copyright(C) 2005-2019 Michael Polak, Arachne Aerospace     */
 /* iptables-restore support Copyright(C) 2007-2008 ludva       */
 /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-/* Modified by: xChaos, 20171012
+/* Modified by: xChaos, 20190912
                  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.9.0-a";
+const char *version = "0.9.0-c";
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 /* Versions: 0.9.0 is development release, 1.0 will be "stable"    */
@@ -40,7 +40,7 @@ const char *version = "0.9.0-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-2017 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-2019 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";
 
 #define STRLEN 512
 #undef DEBUG
@@ -61,6 +61,7 @@ char           *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition
 char      *macrosfile = "/etc/prometheus/prometheus.macros"; /* rewrite rules for most common tariffs */
 char    *upstreamfile = "/etc/prometheus/upstream.interfaces"; /* list of interfaces to manage */
 char  *downstreamfile = "/etc/prometheus/downstream.interfaces"; /* list of interfaces to manage */
+char     *qosfreefile = "/etc/prometheus/qosfree.interfaces"; /* list of interfaces to manage */
 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 */
@@ -100,6 +101,8 @@ char           *medium = "1000Mbit"; /* 10Mbit/100Mbit ethernet */
 char        *ip6prefix = NULL; /* Prefix for global /48 IPv6 subnet */
 char         *qos_leaf = "sfq perturb 5"; /* leaf discipline */
 char    *qos_free_zone = NULL; /* QoS free zone */
+char *qos_free_dst_ipset = NULL; /* QoS free zone - dst match ipset name, must be prepared outside prometheus */
+char *qos_free_src_ipset = NULL; /* QoS free zone - src match ipset name, must be prepared outside prometheus */
 /* 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 */
@@ -138,6 +141,7 @@ struct Keyword *keyword, *defaultkeyword=NULL, *keywords = NULL;
 struct Macro *macro, *macros = NULL;
 struct Index *idxs = NULL, *idx, *metaindex;
 struct Interface *interfaces = NULL, *interface;
+struct QosFreeInterface *qosfreeinterfaces = NULL, *qosfreeinterface;
 
 #define FREE_CLASS      3
 #define OVERLIMIT_CLASS 4
@@ -290,6 +294,7 @@ void get_config(char *config_filename)
   option("hosts",hosts);
   option("downstream-interfaces-list-filename",downstreamfile);
   option("upstream-interfaces-list-filename",upstreamfile);
+  option("qos-free-interfaces-list-filename",qosfreefile);
   option("macros-filename",macrosfile);
   option("ip6-prefix",ip6prefix);
   option("medium",medium);
@@ -311,6 +316,8 @@ void get_config(char *config_filename)
   option("lms-url",lms_url);
   ioption("use-jquery-popups",use_jquery_popups);
   option("qos-free-zone",qos_free_zone);
+  option("qos-free-dst-ipset",qos_free_dst_ipset);
+  option("qos-free-src-ipset",qos_free_src_ipset);
   ioption("qos-free-delay",qos_free_delay);
 /*  ioption("qos-proxy-enable",qos_proxy); */
 /*  option("qos-proxy-ip",proxy_ip);*/
@@ -395,6 +402,10 @@ void iptables_save_line(char *line, int ipv6)
  }
 }
 
+#define IPv4 FALSE
+#define IPv6 TRUE
+
+
 void run_iptables_restore(void)
 {
  char *restor;
@@ -404,7 +415,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 +434,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) 
   {
@@ -562,7 +573,6 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   }
  }
  done; /* ugly macro end */
-
  
  if(just_logs)
  {
@@ -601,6 +611,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  string(str, STRLEN); 
  string(limit_pkts, STRLEN);
 
+ /*-----------------------------------------------------------------*/
+ printf("Parsing qos free interfaces file %s ...\n", qosfreefile);
+ /*-----------------------------------------------------------------*/
+ load(qosfreeinterface, qosfreeinterfaces,
+      qosfreefile, QosFreeInterface, name);
+
  /*-----------------------------------------------------------------*/
  printf("Parsing macro definition file %s ...\n", macrosfile);
  /*-----------------------------------------------------------------*/
@@ -705,7 +721,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 +731,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,22 +751,50 @@ 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 */
+  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);
    }
   }
+
+  if(qos_free_dst_ipset && *qos_free_dst_ipset != '0') /* this is currently supported only for IPv4 */
+  {
+   for_each(interface, interfaces)
+   {
+    sprintf(str,"-A %s -m set --match-set %s %s -o %s -j ACCEPT", interface->chain, qos_free_dst_ipset, (interface->is_upstream?"src":"dst"), interface->name);
+    iptables_save_line(str, IPv4);
+   }
+  }
+
+  if(qos_free_src_ipset && *qos_free_src_ipset != '0') /* this is currently supported only for IPv4 */
+  {
+   for_each(interface, interfaces)
+   {
+    sprintf(str,"-A %s -m set --match-set %s %s -o %s -j ACCEPT", interface->chain, qos_free_src_ipset, (interface->is_upstream?"dst":"src"), interface->name);
+    iptables_save_line(str, IPv4);
+   }
+  }
+  
+  for_each(qosfreeinterface, qosfreeinterfaces)
+  {
+    sprintf(str,"-A FORWARD -i %s -j ACCEPT", qosfreeinterface->name);
+    iptables_save_line(str, IPv4);  
+    iptables_save_line(str, IPv6);
+    sprintf(str,"-A POSTROUTING -o %s -j ACCEPT", qosfreeinterface->name);
+    iptables_save_line(str, IPv4);
+    iptables_save_line(str, IPv6);
+  }
   
   if(ip_count > idxtable_treshold1 && !just_flush)
   {
@@ -760,12 +804,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 +912,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 +926,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,25 +1303,27 @@ 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);
 
-   if(limit_pkts)
+   if(*limit_pkts) /* non-empty string?*/
    {
     /* classify overlimit packets to separate overlimit class */
-    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, 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);
+    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);
    }
 
@@ -1344,15 +1392,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... */