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

diff --git a/prometheus.c b/prometheus.c
index 087102e..252c083 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -29,7 +29,7 @@
 #include "cll1-0.6.2.h"
 #include "ipstruct.h"
 
-const char *version = "0.8.3-j";
+const char *version = "0.8.5-a";
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 /* Versions: 0.8.3 is development release, 0.8.4 will be "stable"  */
@@ -58,6 +58,7 @@ const char               *ls = "/bin/ls"; /* this is not user configurable :-) *
 
 char          *config = "/etc/prometheus/prometheus.conf"; /* main configuration file */
 char           *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition file */
+char      *macrosfile = "/etc/prometheus/prometheus.macros"; /* rewrite rules for most common tariffs */
 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 */
@@ -111,7 +112,7 @@ int      overlimit_min = 256; /* minimum guaranted bandwidth for all undefined h
 int      overlimit_max = 512; /* maximum allowed bandwidth for all undefined hosts */
 int     qos_free_delay = 0; /* seconds to sleep before applying new QoS rules */
 int     digital_divide = 2; /* controls digital divide weirdness ratio, 1...3 */ 
-int        max_nesting = 3; /* maximum nesting of HTB clases, built-in maximum seems to be 4 */
+int        max_nesting = 5; /* /include/uapi/linux/pkt_sched.h: #define TC_HTB_MAXDEPTH 8 [... - 3 parent classes] */
 int            htb_r2q = 256; /* should work for leaf values 512 kbps to 8 Mbps */
 int              burst = 8; /* HTB burst (in kbits) */
 int         burst_main = 64;
@@ -124,7 +125,7 @@ FILE         *log_file = NULL;
 char              *kwd = "via-prometheus"; /* /etc/hosts comment, eg. #qos-64-128 */
 
 const int highest_priority   = 0; /* highest HTB priority (HTB built-in value is 0) */
-const int lowest_priority    = 7; /* lowest HTB priority (HTB built-in value is 7) */
+const int lowest_priority    = 7; /* lowest HTB priority /include/uapi/linux/pkt_sched.h: #define TC_HTB_NUMPRIO 8 */
 const int idxtable_treshold1 = 24;      /* this is no longer configurable */
 const int idxtable_treshold2 = 12;      /* this is no longer configurable */
 const int idxtable_bitmask1  = 3;        /* this is no longer configurable */
@@ -132,7 +133,8 @@ const int idxtable_bitmask2  = 3;        /* this is no longer configurable */
 
 struct IP *ips = NULL, *networks = NULL, *ip, *sharedip;
 struct Group *groups = NULL, *group;
-struct Keyword *keyword, *defaultkeyword=NULL, *keywords=NULL;
+struct Keyword *keyword, *defaultkeyword=NULL, *keywords = NULL;
+struct Macro *macro, *macros = NULL;
 
 #define FREE_CLASS      3
 #define OVERLIMIT_CLASS 4
@@ -237,7 +239,7 @@ void get_config(char *config_filename)
    keyword->leaf_discipline = "";
    keyword->allowed_avgmtu = 0;
 
-   push(keyword,keywords);
+   push(keyword, keywords);
    if(!defaultkeyword)
    {
     defaultkeyword = keyword;
@@ -450,12 +452,20 @@ void run_iptables_restore(void)
 
 char *parse_datafile_line(char *str)
 {
- char *ptr=strchr(str,' ');
+ char *ptr = strchr(str,' ');
+ if(!ptr)
+ {
+  ptr = strchr(str,'\t');
+ }
 
  if(ptr)
  {
-  *ptr=0;
+  *ptr = 0;
   ptr++;
+  while(*ptr == ' ' || *ptr == '\t')
+  {
+   ptr++;
+  }
   return ptr;
  } 
  else 
@@ -571,6 +581,23 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  string(str, STRLEN); 
  string(limit_pkts, STRLEN);
 
+ /*-----------------------------------------------------------------*/
+ printf("Parsing macro definition file %s ...\n", macrosfile);
+ /*-----------------------------------------------------------------*/
+ parse(macrosfile)
+ {
+  ptr = parse_datafile_line(_);
+  if(ptr)
+  {
+   create(macro, Macro);
+   macro->rewrite_from = _;
+   macro->rewrite_to = ptr;
+   push(macro, macros);
+   printf("%s -> %s\n", macro->rewrite_from, macro->rewrite_to);
+  }
+ }
+ done; /* ugly macro end */
+
  /*-----------------------------------------------------------------*/
  printf("Parsing class defintion file %s ...\n", hosts);
  /*-----------------------------------------------------------------*/
@@ -609,7 +636,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   /*-----------------------------------------------------------------*/
   parse(credit)
   {
-   ptr=parse_datafile_line(_);
+   ptr = parse_datafile_line(_);
    if(ptr)
    {
     if_exists(ip,ips,eq(ip->addr,_))
@@ -621,6 +648,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   done; /* ugly macro end */
  }
 
+
  if(!just_preview)
  {
   /*-----------------------------------------------------------------*/