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

diff --git a/prometheus.c b/prometheus.c
index fb8fa4a..045c182 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -1,5 +1,6 @@
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* Prometheus QoS - you can "steal fire" from your ISP         *//* "fair-per-IP" quality of service (QoS) utility              */
+/* 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       */
@@ -131,7 +132,7 @@ 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 */
 
-struct IP *ips = NULL, *ip, *sharedip;
+struct IP *ips = NULL, *networks = NULL, *ip, *sharedip;
 struct Group *groups = NULL, *group;
 struct Keyword *keyword, *defaultkeyword=NULL, *keywords=NULL;
 
@@ -153,6 +154,10 @@ void write_json_traffic(char *json);
 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)
 {
  row_odd_even = 1 - row_odd_even;
@@ -336,10 +341,10 @@ void get_config(char *config_filename)
  /* 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"))
@@ -467,10 +472,13 @@ program
  char *substring;
 
  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;
@@ -493,9 +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; }
@@ -530,7 +542,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
  if(althosts)
  {
-  hosts=althosts;
+  hosts = althosts;
  }
 
  if(just_flush<9)
@@ -549,26 +561,31 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  }
 
  /*-----------------------------------------------------------------*/
- printf("Parsing class defintion file %s ...\n", hosts);
+ /* cll1.h - let's allocate brand new character buffer...           */
  /*-----------------------------------------------------------------*/
- parse_hosts(hosts);
+ string(str,STRLEN); 
 
  /*-----------------------------------------------------------------*/
- /* cll1.h - let's allocate brand new character buffer...           */
+ printf("Parsing class defintion file %s ...\n", hosts);
  /*-----------------------------------------------------------------*/
- string(str,STRLEN); 
+ 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(not sharedip)
@@ -630,8 +647,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   {
     perror(cmdlog);
     exit(-1);
-  }
-  
+  }  
   
   sprintf(str,"%s qdisc del dev %s root 2>/dev/null",tc,lan);
   safe_run(str);
@@ -977,7 +993,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
  if(just_preview)
  {
-  if(start_shaping)
+  if(start_shaping || stop_shaping || reduce_ceil)
   {
    printf("Reading %s and applying Fair Use Policy rules ... \n", classmap);
    parse(classmap)
@@ -990,9 +1006,21 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      if_exists(ip,ips,eq(ip->addr,_))
      {
       ip->mark=atoi(ptr);
-      if(ip->max < ip->desired) /* apply FUP limit immediately.... */
+      if(ip->max < ip->desired || stop_shaping || reduce_ceil) /* apply or disable FUP limit immediately.... */
       {
-       printf("Applying limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark);       
+       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);
@@ -1013,6 +1041,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     perror(classmap);
     puts("Warning - classmap file not fund, just generating preview ...");
     start_shaping=FALSE;
+    stop_shaping=FALSE;
    }
    done; /* ugly macro end */
   }
@@ -1040,6 +1069,15 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   {
    swchar='s';
   }
+  else if(reduce_ceil)
+  {
+   swchar='0'+reduce_ceil; /* -2, -4 */
+  }
+  else if(stop_shaping)
+  {
+   swchar='q';
+  }
+
   printf("Statistics preview generated (-%c switch) - now exiting ...\n", swchar);
   exit(0);
  }  
@@ -1049,7 +1087,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  printf("%-22s %-15s mark\n","name","ip");
 #endif
 
- printf("Writing %s ", classmap); 
+ printf("Writing %s", classmap); 
  f = fopen(classmap, "w"); 
  if(f < 0)
  {