X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=prometheus.c;h=43238b3ca276161ffa5d04a00e9f125b8df23bbd;hb=8dcd2b4cab6d481b0875c702176505b6ef6b6d5d;hp=1227592f5e566027f35ced5bf9272bc9c0234e6f;hpb=7ae5a5939e4328ed4a1d8c025ea6769265574260;p=svn%2FPrometheus-QoS%2F.git diff --git a/prometheus.c b/prometheus.c index 1227592..43238b3 100644 --- a/prometheus.c +++ b/prometheus.c @@ -7,7 +7,7 @@ /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -/* Modified by: xChaos, 20131119 +/* Modified by: xChaos, 20131126 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.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 */ @@ -107,6 +108,8 @@ long long int line = 1024; /* WAN/ISP download in kbps */ long long int up = 1024; /* WAN/ISP upload in kbps */ int free_min = 256; /* minimum guaranted bandwidth for all undefined hosts */ int free_max = 512; /* maximum allowed bandwidth for all undefined hosts */ +int overlimit_min = 256; /* minimum guaranted bandwidth for all undefined hosts */ +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 */ @@ -130,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 @@ -220,24 +224,25 @@ void get_config(char *config_filename) printf("%s ",kwd); create(keyword,Keyword); - keyword->key=kwd; - keyword->asymetry_ratio=1; /* ratio for ADSL-like upload */ - keyword->asymetry_fixed=0; /* fixed treshold for ADSL-like upload */ - keyword->data_limit=8; /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */ - keyword->data_prio=4; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */ - keyword->fixed_limit=0; /* fixed data limit for setting lower HTB ceil */ - keyword->fixed_prio=0; /* fixed data limit for setting lower HTB prio */ - keyword->reserve_min=8; /* bonus for nominal HTB rate bandwidth (in kbps) */ - keyword->reserve_max=0; /* malus for nominal HTB ceil (in kbps) */ - keyword->default_prio=highest_priority+1; - keyword->html_color="000000"; - keyword->ip_count=0; - keyword->leaf_discipline=""; - - push(keyword,keywords); + keyword->key = kwd; + keyword->asymetry_ratio = 1; /* ratio for ADSL-like upload */ + keyword->asymetry_fixed = 0; /* fixed treshold for ADSL-like upload */ + keyword->data_limit = 8; /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */ + keyword->data_prio = 4; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */ + keyword->fixed_limit = 0; /* fixed data limit for setting lower HTB ceil */ + keyword->fixed_prio = 0; /* fixed data limit for setting lower HTB prio */ + keyword->reserve_min = 8; /* bonus for nominal HTB rate bandwidth (in kbps) */ + keyword->reserve_max = 0; /* malus for nominal HTB ceil (in kbps) */ + keyword->default_prio = highest_priority+1; + keyword->html_color = "000000"; + keyword->ip_count = 0; + keyword->leaf_discipline = ""; + keyword->allowed_avgmtu = 0; + + push(keyword, keywords); if(!defaultkeyword) { - defaultkeyword=keyword; + defaultkeyword = keyword; } keywordcount++; @@ -253,17 +258,18 @@ void get_config(char *config_filename) { char *tmptr=_; /* <---- l+1 ----> */ _+=l+1; /* via-prometheus-asymetry-ratio, etc. */ - ioption("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); - loption("magic-fixed-limit",keyword->fixed_limit); - loption("magic-fixed-prio",keyword->fixed_prio); - ioption("htb-default-prio",keyword->default_prio); - ioption("htb-rate-bonus",keyword->reserve_min); - ioption("htb-ceil-malus",keyword->reserve_max); - option("leaf-discipline",keyword->leaf_discipline); - option("html-color",keyword->html_color); + ioption("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); + loption("magic-fixed-limit", keyword->fixed_limit); + loption("magic-fixed-prio", keyword->fixed_prio); + ioption("htb-default-prio", keyword->default_prio); + ioption("htb-rate-bonus", keyword->reserve_min); + ioption("htb-ceil-malus", keyword->reserve_max); + option("leaf-discipline", keyword->leaf_discipline); + option("html-color", keyword->html_color); + ioption("allowed-avgmtu" ,keyword->allowed_avgmtu); _=tmptr; if(keyword->data_limit || keyword->fixed_limit || @@ -316,6 +322,8 @@ void get_config(char *config_filename) /* ioption("qos-proxy-port",proxy_port); */ ioption("free-rate",free_min); ioption("free-ceil",free_max); + ioption("overlimit-rate",overlimit_min); + ioption("overlimit-ceil",overlimit_max); ioption("htb-burst",burst); ioption("htb-burst-main",burst_main); ioption("htb-burst-group",burst_group); @@ -444,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 @@ -565,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); /*-----------------------------------------------------------------*/ @@ -603,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,_)) @@ -615,6 +648,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); done; /* ugly macro end */ } + if(!just_preview) { /*-----------------------------------------------------------------*/ @@ -1356,10 +1390,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); 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, lan, parent, OVERLIMIT_CLASS, 1024, 4096, burst, lowest_priority); + tc, lan, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority); safe_run(str); sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", - tc, wan, parent, OVERLIMIT_CLASS, 1024, 4096, burst, lowest_priority); + tc, wan, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority); safe_run(str); } printf("Total IP count: %d\n", i);