From: xchaos Date: Mon, 21 Feb 2011 14:54:09 +0000 (+0000) Subject: new 0.8.3 trunk made from 0.8.2 branch X-Git-Url: https://git.harvie.cz/?a=commitdiff_plain;h=208112af094ee6be512e5f4d60ca6051f0908cff;p=svn%2FPrometheus-QoS%2F.git new 0.8.3 trunk made from 0.8.2 branch git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@137 251d49ef-1d17-4917-a970-b30cf55b089b --- diff --git a/CHANGELOG b/CHANGELOG index f0f8646..794e297 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +version 0.8.0 2008-11-25 + +- HTB priorities behaviour fixed (magic-priorities keyword is now obsolete) +- prometheus now requires -r ("run") switch to start shaping, default is no action +- C<<1 dialect upgraded to 0.6.2 (for_each() { } instead of every() { }, etc.) +- several minor changesets at https://dev.arachne.cz/svn/prometheus/timeline + version 0.8.0 2008-09-05 - integrated monthly and yearly summary of traffic logs into prometheus script diff --git a/Makefile b/Makefile index 0c98b17..35a1f60 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PACKAGE=prometheus -VERSION=0.8.1 +VERSION=0.8.2 CFLAGS=-std=c99 -Wall prefix=/usr mandir=$(prefix)/share/man diff --git a/cll1-0.6.h b/cll1-0.6.2.h similarity index 88% rename from cll1-0.6.h rename to cll1-0.6.2.h index 3660561..12d27bf 100644 --- a/cll1-0.6.h +++ b/cll1-0.6.2.h @@ -1,8 +1,8 @@ -/* C<<1 header file v0.6.1 - style sheet for ANSI C */ +/* C<<1 header file v0.6.2 - style sheet for ANSI C */ /* Please pronounce as "cee-shift-left-by-one" :) */ -/* Copyright (G) 2004-2007 Michael xChaos Polak, x(at)n.cz +/* Copyright (G) 2004-2008 Michael xChaos Polak, x(at)n.cz The C<<1 header file is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -45,15 +45,15 @@ #define list(T) struct T *_next #define create(A,T) (A=(struct T *)malloc(sizeof(struct T)),A->_next=NULL) #define push(A,B) { if(A && A!=B) A->_next=B; B=A; } -#define append(A,B) { if(B) { void *N=A; A->_next=NULL; search(A,B,!A->_next) {A->_next=N; break;}} else push(A,B); } -#define remove(A,B,C) { void **_D=NULL; search(A,B,C) { if(_D)*_D=A->_next; else B=A->_next; free(A); } else _D=(void *)&(A->_next); } +#define append(A,B) { if(B) { void *N=A; A->_next=NULL; for_selected(A,B,!A->_next) {A->_next=N; break;}} else push(A,B); } +#define remove(A,B,C) { void **_D=NULL; for_selected(A,B,C) { if(_D)*_D=A->_next; else B=A->_next; free(A); } else _D=(void *)&(A->_next); } #define drop(A,B) { for( A=B; A ; B=A, A=A->_next, free(B)); B=NULL; } /* Dynamic list iterations and sequences, updated 2003-05-29 by xCh. */ -#define every(A,B) for( A=B; A; A=A->_next) -#define search(A,B,C) every(A,B) if(C) -#define find(A,B,C) search(A,B,C) break; if(A) +#define for_each(A,B) for( A=B; A; A=A->_next) +#define for_selected(A,B,C) for_each(A,B) if(C) +#define if_exists(A,B,C) for_selected(A,B,C) break; if(A) /* EXP macros for Dummysort sequences, updated 2003-05-29 by xCh. */ @@ -66,7 +66,7 @@ /* Dummysort sequences, updated 2003-05-29 by xCh. */ -#define insert(A,B,EXP,K) { if(B) { void **_L=NULL, *H=B; search(B,H,EXP(B->K,A->K)) { if(_L) {*_L=A; A->_next=B; } else push(A,H); break; } else _L=(void *)&(B->_next); if(!B)*_L=A; B=H; } else push(A,B); } +#define insert(A,B,EXP,K) { if(B) { void **_L=NULL, *H=B; for_selected(B,H,EXP(B->K,A->K)) { if(_L) {*_L=A; A->_next=B; } else push(A,H); break; } else _L=(void *)&(B->_next); if(!B)*_L=A; B=H; } else push(A,B); } #define sort(A,B,EXP,K) { void *_C; A=B; B=NULL; do { _C=A->_next; A->_next=NULL; insert(A,B,EXP,K); A=_C; } while(_C); } /* String macros & sequences, updated 2004-04-19 by xCh. */ @@ -122,7 +122,7 @@ /* Dynamic list advanced I/O, updated 2003-05-30 by xCh. */ #define load(A,B,F,T,K) {char *_S; parses(_S,F) { create(A,T); A->K=_S; A->_eoln=TRUE; append(A,B);} done; A->_eoln=FALSE;} -#define save(A,B,F,K) {FILE *_F=fopen(F,"w"); if(_F) { every(A,B) {fputs(A->K,_F); if(A->_eoln) fputc('\n',_F);} fclose(_F);}} +#define save(A,B,F,K) {FILE *_F=fopen(F,"w"); if(_F) { for_each(A,B) {fputs(A->K,_F); if(A->_eoln) fputc('\n',_F);} fclose(_F);}} /* I/O sequences, updated 2003-05-29 by xCh. */ diff --git a/conf/prometheus.conf b/conf/prometheus.conf index 0e5ab6e..2160698 100644 --- a/conf/prometheus.conf +++ b/conf/prometheus.conf @@ -82,11 +82,9 @@ htb-r2q 1 filter-type classify #or mark #========================================================================== #magic-include-upload - is data counter sum of upload and download ? -#magic-priorities - prioty levels are used by magic-relative-prio #magic-treshold - heaviest downloader: htb-rate, 2nd: htb-rate+magic-treshold #========================================================================== magic-include-upload 1 #1=yes|0=no -magic-priorities 8 #number of priority levels - 2 magic-treshold 2 #kbps #-------------------------------------------------------------------------- #Magic data limit based od guaranted bandwidth in kbps fine tunes HTB ceil: @@ -113,10 +111,10 @@ adsl-prometheus-magic-fixed-prio 0 #-------------------------------------------------------------------------- #These settings are keyword-derived ! (see "keyword" section) #-------------------------------------------------------------------------- -via-prometheus-htb-default-prio 1 #can be 1...magic-priorities-2 +via-prometheus-htb-default-prio 1 #can be 1...7 via-prometheus-htb-rate-bonus 0 #kbps via-prometheus-htb-ceil-malus 0 #kbps -adsl-prometheus-htb-default-prio 1 +adsl-prometheus-htb-default-prio 1 adsl-prometheus-htb-rate-bonus 16 adsl-prometheus-htb-ceil-malus 0 #========================================================================== diff --git a/examples/prometheus.conf b/examples/prometheus.conf index fff604b..5a41697 100644 --- a/examples/prometheus.conf +++ b/examples/prometheus.conf @@ -83,11 +83,9 @@ htb-leaf-discipline sfq perturb 5 filter-type classify #or mark #========================================================================== #magic-include-upload - is data counter sum of upload and download ? -#magic-priorities - prioty levels are used by magic-relative-prio #magic-treshold - heaviest downloader: htb-rate, 2nd: htb-rate+magic-treshold #========================================================================== magic-include-upload 1 #1=yes|0=no -magic-priorities 8 #number of priority levels - 2 magic-treshold 2 #kbps #-------------------------------------------------------------------------- #Magic data limit based od guaranted bandwidth in kbps fine tunes HTB ceil: @@ -126,21 +124,21 @@ backbone-bezfup-magic-fixed-prio 0 #-------------------------------------------------------------------------- #These settings are keyword-derived ! (see "keyword" section) #-------------------------------------------------------------------------- -wifi-normal-htb-default-prio 1 #can be 1...magic-priorities-2 +wifi-normal-htb-default-prio 1 #can be 1...7 wifi-normal-htb-rate-bonus 0 #kbps wifi-normal-htb-ceil-malus 0 #kbps -wifi-plus-htb-default-prio 1 +wifi-plus-htb-default-prio 1 wifi-plus-htb-rate-bonus 16 -wifi-plus-htb-ceil-malus 0 -backbone-normal-htb-default-prio 1 +wifi-plus-htb-ceil-malus 0 +backbone-normal-htb-default-prio 1 backbone-normal-htb-rate-bonus 16 -backbone-normal-htb-ceil-malus 0 -backbone-plus-htb-default-prio 1 +backbone-normal-htb-ceil-malus 0 +backbone-plus-htb-default-prio 1 backbone-plus-htb-rate-bonus 32 -backbone-plus-htb-ceil-malus 0 -backbone-bezfup-htb-default-prio 2 +backbone-plus-htb-ceil-malus 0 +backbone-bezfup-htb-default-prio 2 backbone-bezfup-htb-rate-bonus 0 -backbone-bezfup-htb-ceil-malus 0 +backbone-bezfup-htb-ceil-malus 0 #========================================================================== #Credit file settings - stores unused credit from previous runs #-------------------------------------------------------------------------- diff --git a/prometheus.c b/prometheus.c index af2b718..bd1a8d0 100644 --- a/prometheus.c +++ b/prometheus.c @@ -7,9 +7,9 @@ /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -/* Modified by: xChaos, 20080728 +/* Modified by: xChaos, 20110221 ludva, 20080415 - + Prometheus QoS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2.1 of @@ -31,11 +31,11 @@ #define FIRSTIPCLASS 2048 #undef DEBUG -#include "cll1-0.6.h" +#include "cll1-0.6.2.h" -const char *version = "0.8.1-b"; +const char *version = "0.8.3"; -/* Version numbers: 0.7.9 is development releases ("beta"), 0.8.0 will be "stable" */ +/* Version numbers: 0.8.3 is development releases ("beta"), 0.8.4 will be "stable" */ /* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */ /* C source code development versions ("beta"): 0.7.9-a, 0.8.1-b, etc. */ /* C source code release versions: 0.8.0, 0.8.2, 0.8.4, etc. */ @@ -48,7 +48,7 @@ char *tc = "/sbin/tc"; /* requires tc with HTB support */ char *iptables = "/sbin/iptables"; /* requires iptables utility */ char *iptablessave = "/sbin/iptables-save"; /* not yet required */ char *iptablesrestore = "/sbin/iptables-restore"; /* requires iptables-restore */ -char *ls = "/bin/ls"; /* this is not user configurable :-) */ +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 */ @@ -69,20 +69,20 @@ void help(void) puts("Command line switches:\n\ \n\ -?, --help this help screen\n\ --v, --version show version number of this utility and exit\n\ --c filename force alternative /etc/prometheus.conf filename\n\ --h filename force alternative /etc/hosts filename (overrides hosts keyword)\n\ --f just flush iptables and tc classes and exit (stop shaping)\n\ +-v, --version show Version number of this utility and exit\n\ +-c filename force alternative /etc/prometheus.Conf filename\n\ +-h filename force alternative /etc/Hosts filename (overrides hosts keyword)\n\ +-f just Flush iptables and tc classes and exit (stop shaping)\n\ -9 emergency iptables flush (do not read data transfer statistics)\n\ --p just generate preview of data transfer statistics and exit\n\ --n no delay (overrides qos-free-delay keyword)\n\ --d dry run (preview tc and iptables commands on stdout)\n\ --l Mmm YYYY generate HTML summary of traffic logs (Mmm=Jan-Dec or Year, YYYY=year)\n\ --m generate HTML summary of traffic logs for yesterday's month\n\ --y generate HTML summary of traffic logs for yesterday's year\n"); +-p just generate Preview of data transfer statistics and exit\n\ +-d Dry run (preview tc and iptables commands on stdout)\n\ +-r Run (reset all statistics and start shaping)\n\ +-n run Now (start shaping without delay - overrides qos-free-delay keyword)\n\ +-l Mmm YYYY generate HTML summary of traffic Logs (Mmm=Jan-Dec or Year, YYYY=year)\n\ +-m generate HTML summary of traffic logs for yesterday's Month\n\ +-y generate HTML summary of traffic logs for yesterday's Year\n"); /* not yet implemented: -s start shaping! (keep data transfer statistics - but apply shaping)\n\ --r just reload configuration (...and keep data transfer statistics)\n\ */ } /* === Configuraration file values defaults - stored in global variables ==== */ @@ -114,11 +114,10 @@ int free_max = 64; /* maximum allowed bandwidth for all undefined host 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 htb_r2q = 1; +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; int burst_group = 32; -int magic_priorities = 8; /* number of priority levels (soft shaping) */ int magic_treshold = 8; /* reduce ceil by X*magic_treshhold kbps (hard shaping) */ int keywordcount = 0; /* not yet implemented: @@ -128,10 +127,12 @@ int packet_limit = 5; maximum number of pps to htn CEIL, not rate !!! FILE *log_file = NULL; char *kwd = "via-prometheus"; /* /etc/hosts comment, eg. #qos-64-128 */ -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 */ -const int idxtable_bitmask2=3; /* this is no longer configurable */ +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 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 */ +const int idxtable_bitmask2 = 3; /* this is no longer configurable */ /* ==== This is C<<1 stuff - learn C<<1 first! http://cll1.arachne.cz ==== */ @@ -207,7 +208,7 @@ void TheIP(void) ip->name=""; ip->addr=""; ip->sharing=NULL; - ip->prio=1; + ip->prio=highest_priority+1; ip->fixedprio=0; ip->mark=ip->min=ip->max=ip->desired=ip->credit=0; ip->upload=ip->proxy=ip->direct=ip->traffic=0; @@ -313,16 +314,15 @@ void get_config(char *config_filename) 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->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) */ /* obsolete: keyword->divide_max=0; relative malus: new_ceil=rate+(old_ceil-rate)/divide_max - keyword->htb_ceil_bonus_divide=0; relative bonus: new_ceil=old_ceil+old_ceil/htb_ceil_bonus_divide -*/ - keyword->default_prio=1; + keyword->htb_ceil_bonus_divide=0; relative bonus: new_ceil=old_ceil+old_ceil/htb_ceil_bonus_divide */ + keyword->default_prio=highest_priority+1; keyword->html_color="000000"; keyword->ip_count=0; keyword->leaf_discipline=""; @@ -333,36 +333,39 @@ void get_config(char *config_filename) kwd=NULL; } - else every(keyword,keywords) + else { - int l=strlen(keyword->key); + for_each(keyword,keywords) + { + int l=strlen(keyword->key); - if(!strncmp(keyword->key,_,l) && strlen(_)>l+2) - { - 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); -/* obsolete: - ioption("htb-ceil-divide",keyword->divide_max); - ioption("htb-ceil-bonus-divide",keyword->htb_ceil_bonus_divide); -*/ - option("leaf-discipline",keyword->leaf_discipline); - option("html-color",keyword->html_color); - _=tmptr; - - if(keyword->data_limit || keyword->fixed_limit || - keyword->data_prio || keyword->fixed_prio) - use_credit=1; - } + if(!strncmp(keyword->key,_,l) && strlen(_)>l+2) + { + 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); + /* obsolete: + ioption("htb-ceil-divide",keyword->divide_max); + ioption("htb-ceil-bonus-divide",keyword->htb_ceil_bonus_divide); + */ + option("leaf-discipline",keyword->leaf_discipline); + option("html-color",keyword->html_color); + _=tmptr; + + if(keyword->data_limit || keyword->fixed_limit || + keyword->data_prio || keyword->fixed_prio) + use_credit=1; + } + } } option("tc",tc); @@ -401,7 +404,6 @@ void get_config(char *config_filename) ioption("htb-nesting-limit",max_nesting); ioption("htb-r2q",htb_r2q); ioption("magic-include-upload",include_upload); - ioption("magic-priorities",magic_priorities); ioption("magic-treshold",magic_treshold); option("filter-type", cnf); @@ -419,9 +421,10 @@ void get_config(char *config_filename) printf("\n"); /*leaf discipline for keywords*/ - every(keyword,keywords) + for_each(keyword,keywords) { - if (!strcmpi(keyword->leaf_discipline, "")){ + if (!strcmpi(keyword->leaf_discipline, "")) + { keyword->leaf_discipline = qos_leaf; } } @@ -465,7 +468,7 @@ void get_traffic_statistics(void) append(line,lines); } - every(line,lines) + for_each(line,lines) { int col, accept=0,proxyflag=0,valid=1,setchainname=0,commonflag=0; unsigned long long traffic=0; @@ -516,7 +519,8 @@ void get_traffic_statistics(void) if(proxyflag)printf("(proxy) "); else if(!downloadflag) printf("(upload) "); printf("IP %s: %Lu M (%ld pkts)\n", ipaddr, traffic, pkts); - find(ip,ips,eq(ip->addr,ipaddr)); + + if_exists(ip,ips,eq(ip->addr,ipaddr)); else { TheIP(); @@ -612,7 +616,11 @@ void parse_ip(char *str) ptr++; *ptr=0; - find(ip,ips,eq(ip->addr,ipaddr)); else TheIP(); + if_exists(ip,ips,eq(ip->addr,ipaddr)); + else + { + TheIP(); + } ip->addr=ipaddr; ip->name=ipname; } @@ -636,13 +644,15 @@ struct IpLog char *name; long traffic; long guaranted; + int i; + long l; list(IpLog); } *iplog,*iplogs; void parse_ip_log(int argc, char **argv) { - char *month, *year, *str, *name, *ptr, *ptr2, *filename; - long traffic, traffic_month, total=0, guaranted; + char *month, *year, *str, *name="(undefined)", *ptr, *ptr2, *filename; + long traffic=0l, traffic_month, total=0, guaranted; int col, col2, y_ok, m_ok, accept_month, i=1, any_month=0; char mstr[4], ystr[5]; FILE *f; @@ -651,37 +661,37 @@ void parse_ip_log(int argc, char **argv) if(argv[1][1]=='l') /* -l */ { - if(argc<4) - { - puts("Missing parameter(s)!\nUsage: prometheus -l Mmm YYYY (Mmm=Jan-Dec or Year, YYYY=year)"); - exit(-1); - } - else - { - month=argv[2]; - if(eq(month,"Year")) any_month=1; - year=argv[3]; - } + if(argc<4) + { + puts("Missing parameter(s)!\nUsage: prometheus -l Mmm YYYY (Mmm=Jan-Dec or Year, YYYY=year)"); + exit(-1); + } + else + { + month=argv[2]; + if(eq(month,"Year")) any_month=1; + year=argv[3]; + } } else { - time_t t = time(NULL) - 3600*24 ; /* yesterday's timestamp*/ - struct tm *timep = localtime(&t); - - if(argv[1][1]=='m') /* -m yestarday - month */ - { - strftime(mstr, 4, "%b", timep); - month=mstr; - strftime(ystr, 5, "%Y", timep); - year=ystr; - } - else /* -y yesterday - year */ - { - month="Year"; - any_month=1; - strftime(ystr, 5, "%Y", timep); - year=ystr; - } + time_t t = time(NULL) - 3600*24 ; /* yesterday's timestamp*/ + struct tm *timep = localtime(&t); + + if(argv[1][1]=='m') /* -m yestarday - month */ + { + strftime(mstr, 4, "%b", timep); + month=mstr; + strftime(ystr, 5, "%Y", timep); + year=ystr; + } + else /* -y yesterday - year */ + { + month="Year"; + any_month=1; + strftime(ystr, 5, "%Y", timep); + year=ystr; + } } printf("Analysing traffic for %s %s ...\n",month,year); @@ -712,11 +722,11 @@ void parse_ip_log(int argc, char **argv) case 9: case 10: if (isalpha(*ptr)) /* character, not numeric string = date, just one*/ { - valid_columns(ptr2,ptr,' ',col2) switch(col2) - { - case 2: if(any_month || eq(ptr2,month)) m_ok = 1; break; - case 5: if(eq(ptr2,year)) y_ok = 1; break; - } + valid_columns(ptr2,ptr,' ',col2) switch(col2) + { + case 2: if(any_month || eq(ptr2,month)) m_ok = 1; break; + case 5: if(eq(ptr2,year)) y_ok = 1; break; + } } else { @@ -742,7 +752,9 @@ void parse_ip_log(int argc, char **argv) printf(" %ld MB\n",iplog->traffic); } else + { puts(" no records."); + } } } sprintf(str,"%s/%s-%s.html",html_log_dir,year,month); @@ -751,22 +763,86 @@ void parse_ip_log(int argc, char **argv) if(f) { fprintf(f,"\n ",month,year); - every(iplog,iplogs) + + for_each(iplog,iplogs) + { if(iplog->traffic) { - fprintf(f,"\n", + fprintf(f,"\n", i++, iplog->name, iplog->traffic, iplog->traffic>>10, iplog->guaranted); total+=iplog->traffic>>10; + iplog->i=i; + iplog->l=total; } + } fprintf(f,"\n", total, line); fputs("
%s %sData transfersMin.speed
%d%s%ld MB%ld GB%ld kbps
%d%s%ld M%ld G%ld kbps
Total:%ld GB%Ld kbps
\n", f); + + if(i>10) + { + fputs("

\n",f); + fputs("\n",f); + fputs("\n",f); + + if_exists(iplog,iplogs,iplog->l>=total/4) + { + fprintf(f,"\n"); + fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + } + + if_exists(iplog,iplogs,iplog->i==10) + { + fprintf(f,"\n"); + fprintf(f,"\n",(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + } + + if_exists(iplog,iplogs,iplog->l>=total/2) + { + fprintf(f,"\n"); + fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + } + + if_exists(iplog,iplogs,iplog->l>=4*total/5) + { + fprintf(f,"\n"); + fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + } + + if_exists (iplog,iplogs,iplog->i>=i/5) + { + fprintf(f,"\n"); + fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + } + + if_exists(iplog,iplogs,iplog->i>=i/4) + { + fprintf(f,"\n"); + fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + } + + if_exists(iplog,iplogs,iplog->i>=i/2) + { + fprintf(f,"\n"); + fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + } + + if_exists(iplog,iplogs,iplog->i>=4*i/5) + { + fprintf(f,"\n"); + fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + } + + fprintf(f,"\n"); + fprintf(f,"\n",i-1,total); + fputs("
Enterprise Research and Planning (ERP)
Analytic categoryActive ClassesData transfers
Top 25%% of traffic%d%d %%%ld G%d %%
Top 10 downloaders10%d %%%ld G%d %%
Top 50%% of traffic%d%d %%%ld G%d %%
Top 80%% of traffic%d%d %%%ld G%d %%
Top 20%% downloaders%d%d %%%ld G%d %%
Top 25%% downloaders%d%d %%%ld G%d %%
Top 50%% downloaders%d%d %%%ld G%d %%
Top 80%% downloaders%d%d %%%ld G%d %%
All users, all traffic%d100 %%%ld G100 %%
\n", f); + } + fprintf(f, stats_html_signature, version); fclose(f); puts(" done."); } } - /*-----------------------------------------------------------------*/ /* Are you looking for int main(int argc, char **argv) ? :-)) */ /*-----------------------------------------------------------------*/ @@ -779,10 +855,11 @@ program char *substring; int class_count=0,ip_count=0; int parent=1; - int just_flush=0; - int nodelay=0; - int just_preview=0; /* preview - generate just stats */ - int just_logs=0; /* just parse logs */ + int just_flush=FALSE; + int nodelay=FALSE; + int just_preview=FALSE; /* preview - generate just stats */ + int just_logs=FALSE; /* just parse logs */ + int run=FALSE; char *chain_forward, *chain_postrouting; char *althosts=NULL; @@ -799,24 +876,27 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); { argument("-c") { nextargument(config); } argument("-h") { nextargument(althosts);} - argument("-d") { dry_run=1; } - argument("-f") { just_flush=1; } - argument("-9") { just_flush=9; } - argument("-p") { just_preview=1; } - argument("-n") { nodelay=1; } - argument("-l") { just_logs=1; } - argument("-m") { just_logs=1; } - argument("-y") { just_logs=1; } + argument("-d") { run=TRUE; dry_run=TRUE; } + argument("-f") { run=TRUE; just_flush=TRUE; } + argument("-9") { run=TRUE; just_flush=9; } + argument("-p") { run=TRUE; just_preview=TRUE; } + argument("-r") { run=TRUE; } + argument("-n") { run=TRUE; nodelay=TRUE; } + argument("-l") { just_logs=TRUE; } + argument("-m") { just_logs=TRUE; } + argument("-y") { just_logs=TRUE; } argument("-?") { help(); exit(0); } argument("--help") { help(); exit(0); } argument("-v") { exit(0); } argument("--version") { exit(0); } } - + if(dry_run) + { puts("*** THIS IS JUST DRY RUN ! ***\n"); + } - date(d); /* this is typical cll1.h macro */ + date(d); /* this is typical cll1.h macro - prints current date */ /*-----------------------------------------------------------------*/ printf("Parsing configuration file %s ...\n", config); @@ -825,11 +905,19 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); if(just_logs) { - parse_ip_log(argc,argv); - exit(0); + parse_ip_log(argc,argv); + exit(0); + } + else if(not run) + { + help(); + exit(0); } - if(althosts) hosts=althosts; + if(althosts) + { + hosts=althosts; + } if(just_flush<9) { @@ -867,7 +955,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); { //Do we have to create new QoS class for this IP ? - find(keyword,keywords,(substring=strstr(str,keyword->key))) + if_exists(keyword,keywords,(substring=strstr(str,keyword->key))) { parse_ip(str); ip_count++; @@ -909,7 +997,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } ip->mark=FIRSTIPCLASS+1+class_count++; - find(group,groups,group->min==ip->min) + if_exists(group,groups,group->min==ip->min) { group->count++; group->desired+=ip->min; @@ -949,9 +1037,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /*-----------------------------------------------------------------*/ puts("Resolving shared connections ..."); /*-----------------------------------------------------------------*/ - search(ip,ips,ip->sharing) + for_selected(ip,ips,ip->sharing) { - search(sharedip,ips,eq(sharedip->name,ip->sharing)) + for_selected(sharedip,ips,eq(sharedip->name,ip->sharing)) { sharedip->traffic+=ip->traffic; ip->traffic=0; @@ -972,8 +1060,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); ptr=parse_datafile_line(_); if(ptr) { - find(ip,ips,eq(ip->addr,_)) + if_exists(ip,ips,eq(ip->addr,_)) + { sscanf(ptr,"%Lu",&(ip->credit)); + } } } done; @@ -1046,11 +1136,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); save_line(":post_common - [0:0]"); save_line(":forw_common - [0:0]"); - search(ip,ips,ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0")) + for_selected(ip,ips,ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0")) { buf=hash_id(ip->addr,bitmask); - find(idx,idxs,eq(idx->id,buf)) + if_exists(idx,idxs,eq(idx->id,buf)) + { idx->children++; + } else { create(idx,Index); @@ -1069,11 +1161,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); { bitmask-=idxtable_bitmask2; idxcount=0; - search(idx,idxs,idx->parent==NULL) + + for_selected(idx,idxs,idx->parent==NULL) { buf=hash_id(idx->addr,bitmask); - find(metaindex,idxs,eq(metaindex->id,buf)) - metaindex->children++; + if_exists(metaindex,idxs,eq(metaindex->id,buf)) + { + metaindex->children++; + } else { create(metaindex,Index); @@ -1094,7 +1189,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); sort(idx,idxs,order_by,bitmask); i=0; - every(idx,idxs) + + for_each(idx,idxs) { subnet=subnet_id(idx->addr,idx->bitmask); printf("%d: %s/%d\n",++i,subnet,idx->bitmask); @@ -1163,24 +1259,28 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",tc,lan,htb_r2q); safe_run(str); - sprintf(str,"%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio 0",tc,lan,lan_medium,lan_medium,burst_main); + sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d", + tc,lan,lan_medium,lan_medium,burst_main,highest_priority); safe_run(str); - sprintf(str,"%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio 0",tc,lan,line,line,burst_main); + sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d", + tc,lan,line,line,burst_main,highest_priority); safe_run(str); sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",tc,wan,htb_r2q); safe_run(str); - sprintf(str,"%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio 0",tc,wan,wan_medium,wan_medium,burst_main); + sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d", + tc,wan,wan_medium,wan_medium,burst_main,highest_priority); safe_run(str); - sprintf(str,"%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio 0",tc,wan,up,up,burst_main); + sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d", + tc,wan,up,up,burst_main,highest_priority); safe_run(str); } /*-----------------------------------------------------------------*/ - puts("Locating suckers and generating root classes ..."); + puts("Locating heavy downloaders and generating root classes ..."); /*-----------------------------------------------------------------*/ sort(ip,ips,desc_order_by,traffic); @@ -1195,19 +1295,18 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); if(!just_preview && !dry_run && enable_credit) credit_file=fopen(credit,"w"); - every(group,groups) + for_each(group,groups) { if(!just_preview) { - //download - sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio 1 #down desired %d", - tc, lan, parent, group->id, rate, max, burst_group, group->desired); + sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d #down desired %d", + tc, lan, parent, group->id, rate, max, burst_group, highest_priority+1, group->desired); safe_run(str); //upload - sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio 1 #up desired %d", - tc, wan, parent, group->id, rate*up/line, max*up/line, burst_group, group->desired); + sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d #up desired %d", + tc, wan, parent, group->id, rate*up/line, max*up/line, burst_group, highest_priority+1, group->desired); safe_run(str); } @@ -1219,9 +1318,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /*shaping of aggresive downloaders, with credit file support */ if(use_credit) { - int group_rate=group->min, priority_sequence=magic_priorities+1; + int group_rate=group->min, priority_sequence=lowest_priority; - search(ip, ips, ip->min==group->min && ip->max>ip->min) + for_selected(ip, ips, ip->min==group->min && ip->max>ip->min) { if( ip->keyword->data_limit && !ip->fixedprio && ip->traffic>ip->credit+ @@ -1229,8 +1328,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); { if(group_ratemax) ip->max=group_rate; group_rate+=magic_treshold; - ip->prio=magic_priorities+2; - if(ip->prio<3) ip->prio=3; + ip->prio=lowest_priority; + if(ip->prioprio=highest_priority+2; } else { @@ -1239,7 +1338,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20)) ) { ip->prio=priority_sequence--; - if(ip->prio<2) ip->prio=2; + if(ip->prioprio=highest_priority+1; } if(credit_file) @@ -1271,7 +1370,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); f=fopen("/var/run/prometheus.previous","w"); if(f) { - search(ip,ips,ip->traffic || ip->direct || ip->proxy ||ip->upload) + for_selected(ip,ips,ip->traffic || ip->direct || ip->proxy ||ip->upload) fprintf(f,"%s %Lu %Lu %Lu %Lu\n",ip->addr,ip->traffic,ip->direct,ip->proxy,ip->upload); fclose(f); } @@ -1293,7 +1392,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); fputs("\n\n",f); fprintf(f,"\n",keywordcount); fputs("\n",f); - every(group,groups) + + for_each(group,groups) { #ifdef DEBUG printf("%d k group: %d bandwidth requested: %d k\n",group->min,group->count,group->desired); @@ -1301,9 +1401,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); fprintf(f,"",count,group->min); fprintf(f,"",group->count,group->desired); - every(keyword,keywords) - fprintf(f,"",keyword->html_color,group->min*keyword->data_limit); - + for_each(keyword,keywords) + { + fprintf(f,"",keyword->html_color,group->min*keyword->data_limit); + } i+=group->desired; total+=group->count; count++; @@ -1314,9 +1415,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); fprintf(f,"",keyword->ip_count); - + for_each(keyword,keywords) + { + fprintf(f,"",keyword->ip_count); + } fprintf(f,"\n",(int)(0.5+i/line)); fprintf(f,"\n",keywordcount,total); @@ -1354,7 +1456,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); \ \n",f); - every(ip,ips) + for_each(ip,ips) { char *f1="", *f2=""; if(ip->maxdesired) @@ -1362,7 +1464,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); f1=""; f2=""; } - else if(ip->prio>1) + else if(ip->prio>highest_priority+1) { f1=""; f2=""; @@ -1422,49 +1524,49 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); fputs("\n",f); fputs("\n",f); - find(sum,sums,sum->l>=total/4) + if_exists(sum,sums,sum->l>=total/4) { fprintf(f,"\n"); fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); } - find(sum,sums,sum->i==10) + if_exists(sum,sums,sum->i==10) { fprintf(f,"\n"); fprintf(f,"\n",(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); } - find(sum,sums,sum->l>=total/2) + if_exists(sum,sums,sum->l>=total/2) { fprintf(f,"\n"); fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); } - find(sum,sums,sum->l>=4*total/5) + if_exists(sum,sums,sum->l>=4*total/5) { fprintf(f,"\n"); fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); } - find (sum,sums,sum->i>=(active_classes+1)/5) + if_exists (sum,sums,sum->i>=(active_classes+1)/5) { fprintf(f,"\n"); fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); } - find(sum,sums,sum->i>=(active_classes+1)/4) + if_exists(sum,sums,sum->i>=(active_classes+1)/4) { fprintf(f,"\n"); fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); } - find(sum,sums,sum->i>=(active_classes+1)/2) + if_exists(sum,sums,sum->i>=(active_classes+1)/2) { fprintf(f,"\n"); fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); } - find(sum,sums,sum->i>=4*(active_classes+1)/5) + if_exists(sum,sums,sum->i>=4*(active_classes+1)/5) { fprintf(f,"\n"); fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); @@ -1490,7 +1592,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); i=0; printf("%-22s %-15s mark\n","name","ip"); - search(ip,ips,ip->mark>0) + + for_selected(ip,ips,ip->mark>0) { if(idxs) @@ -1633,9 +1736,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /*-----------------------------------------------------------------*/ puts("Generating free bandwith classes ..."); /*-----------------------------------------------------------------*/ - sprintf(str,"%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio 2",tc,lan,parent,free_min,free_max,burst); + sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d", + tc,lan,parent,free_min,free_max,burst,lowest_priority); safe_run(str); - sprintf(str,"%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio 2",tc,wan,parent,free_min,free_max,burst); + sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d", + tc,wan,parent,free_min,free_max,burst,lowest_priority); safe_run(str); /* tc SFQ */ if (strcmpi(qos_leaf, "none"))
#groupIPsrequesteddata limits
%d%d k%d%d k%d M%d M
Line %Ld k",line); fprintf(f,"%d%d k",total,i); - every(keyword,keywords) - fprintf(f,"%d IPs%d IPs
Aggregation 1/%d%d traffic classes
maximumprio
Analytic categoryActive ClassesData transfers
Top 25%% of traffic%d%d %%%Lu M%Ld %%
Top 10 downloaders10%d %%%Lu M%Ld %%
Top 50%% of traffic%d%d %%%Lu M%Ld %%
Top 80%% of traffic%d%d %%%Lu M%Ld %%
Top 20%% downloaders%d%d %%%Lu M%Ld %%
Top 25%% downloaders%d%d %%%Lu M%Ld %%
Top 50%% downloaders%d%d %%%Lu M%Ld %%
Top 80%% downloaders%d%d %%%Lu M%Ld %%