X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=70bea1f2355559c9dca504dde27523d95bc36558;hp=64012559235dc72987d087318984737e747a92bf;hb=f64d54310ae39276c552b80183ae2320789bb4be;hpb=5692c7757847ed4d412173d820392dbf2cfb5a70 diff --git a/prometheus.c b/prometheus.c index 6401255..70bea1f 100644 --- a/prometheus.c +++ b/prometheus.c @@ -1,13 +1,13 @@ - /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - /* 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-2012 Michael Polak, Arachne Labs */ -/* iptables-restore support Copyright(C) 2007-2008 ludva */ -/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */ -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -/* Modified by: xChaos, 20120612 +/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* 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 */ +/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */ +/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + +/* Modified by: xChaos, 20130116 ludva, 20080415 Prometheus QoS is free software; you can redistribute it and/or @@ -26,39 +26,45 @@ GNU General Public License is located in file COPYING */ -#define STRLEN 512 -#define FIRSTGROUPID 1024 -#define FIRSTIPCLASS 2048 -#undef DEBUG - #include "cll1-0.6.2.h" +#include "ipstruct.h" -const char *version = "0.8.3-f"; +const char *version = "0.8.3-h"; -/* 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. */ +/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* Versions: 0.8.3 is development release, 0.8.4 will be "stable" */ +/* Official Trac URL: https://dev.arachne.cz/svn/prometheus */ +/* Official SVN URL: https://dev.arachne.cz/repos/prometheus */ +/* BTC donations account: 19rriLx8vR19wGefPaMhakqnCYNYwjLvxq */ +/* CZK donations account: 2900242944/2010 (transparent account) */ +/* Warning: unofficial Github mirror is not supported by author! */ +/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -const char *stats_html_signature = "Statistics generated by Prometheus QoS version %s
GPL+Copyright(C)2005-2012 Michael Polak, Arachne Labs\n"; +const char *stats_html_signature = "Statistics generated by Prometheus QoS version %s
GPL+Copyright(C)2005-2013 Michael Polak, Arachne Labs\n"; + +#define STRLEN 512 +#undef DEBUG /* ======= All path names are defined here (for RPM patch) ======= */ -const char *tc = "/sbin/tc"; /* requires tc with HTB support */ -const char *iptables = "/sbin/iptables"; /* requires iptables utility */ -const char *iptablessave = "/sbin/iptables-save"; /* not yet required */ -const char *iptablesrestore = "/sbin/iptables-restore"; /* requires iptables-restore */ -const char *ls = "/bin/ls"; /* this is not user configurable :-) */ +const char *tc = "/sbin/tc"; /* requires tc with HTB support */ +const char *iptables = "/sbin/iptables"; /* requires iptables utility */ +const char *ip6tables = "/sbin/ip6tables"; /* requires iptables utility */ +const char *iptablessave = "/sbin/iptables-save"; /* not yet required */ +const char *iptablesrestore = "/sbin/iptables-restore"; /* requires iptables-restore */ +const char *ip6tablessave = "/sbin/ip6tables-save"; /* not yet required */ +const char *ip6tablesrestore = "/sbin/ip6tables-restore"; /* requires iptables-restore */ +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 *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 */ char *classmap = "/var/lib/misc/prometheus.classes"; /* credit log file */ char *html = "/var/www/traffic.html"; /* hall of fame - html version */ char *preview = "/var/www/preview.html"; /* hall of fame preview - html version */ -char *json = "/var/www/logs/traffic.json"; /* hall of fame - json version */ +char *json_traffic = "/var/www/logs/traffic.json"; /* hall of fame - json version */ char *json_preview = "/var/www/logs/preview.json"; /* hall of fame preview - json version */ char *cmdlog = "/var/log/prometheuslog"; /* command log filename */ char *log_dir = "/var/www/logs/"; /* log directory pathname, ended with slash */ @@ -67,70 +73,31 @@ char *html_log_dir = "/var/www/logs/html/"; char *jquery_url = "http://code.jquery.com/jquery-latest.js"; char *lms_url = "/lms/?m=customerinfo&id="; -int use_jquery_popups = 1; +int use_jquery_popups = TRUE; int row_odd_even = 0; /* */ - - -void parse_ip_log(int argc, char **argv); -/* implementid in parselog.c */ - -const char *tr_odd_even(void) -{ - row_odd_even = 1 - row_odd_even; - if(row_odd_even) - { - return "\n"; - } - else - { - return "\n"; - } -} - -/* ======= Help screen is hopefuly self-documenting part of code :-) ======= */ - -void help(void) -{ - puts("Command line switches:\n\ -\n\ --d Dry run (preview tc and iptables commands on stdout)\n\ --r Run (reset all statistics and start shaping - daily usage)\n\ --p just generate Preview of data transfer statistics and exit (after -r)\n\ --s start Shaping FUP limits (keeps data transfer stat like -p) (after -r)\n\ --n run Now (like -r delay - overrides qos-free-delay keyword, after boot)\n\ --f just Flush iptables and tc classes and exit (stop shaping, no QiS)\n\ --9 emergency iptables flush (like -f, but dumps data transfer statistics)\n\ -\n\ --c filename force alternative /etc/prometheus/prometheus.conf filename\n\ --h filename force alternative /etc/hosts filename (overrides hosts keyword)\n\ --l Mmm YYYY generate HTML summary of Logged traffic (Mmm=Jan-Dec) (and exit)\n\ --m generate HTML summary of traffic for yesterday's Month (and exit)\n\ --y generate HTML summary of traffic for yesterday's Year (and exit)\n\ --? --help show this help scree (and exit)\n\ --v --version show Version number of this utility (and exit)\n"); -} - + /* === Configuraration file values defaults - stored in global variables ==== */ int filter_type = 1; /*1 mark, 2 classify*/ char *mark = "MARK"; char *mark_iptables = "MARK --set-mark "; -int dry_run = 0; /* preview - use puts() instead of system() */ +int dry_run = FALSE; /* preview - use puts() instead of system() */ char *iptablespreamble = "*mangle\n:PREROUTING ACCEPT [0:0]\n:POSTROUTING ACCEPT [0:0]\n:INPUT ACCEPT [0:0]\n:OUTPUT ACCEPT [0:0]\n:FORWARD ACCEPT [0:0]"; FILE *iptables_file = NULL; -int enable_credit = 1; /* enable credit file */ -int use_credit = 0; /* use credit file (if enabled)*/ +int enable_credit = TRUE; /* enable credit file */ +int use_credit = FALSE; /* use credit file (if enabled)*/ char *title = "Hall of Fame - Greatest Suckers"; /* hall of fame title */ -int hall_of_fame = 1; /* enable hall of fame */ +int hall_of_fame = TRUE; /* enable hall of fame */ char *lan = "eth0"; /* LAN interface */ char *lan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */ char *wan = "eth1"; /* WAN/ISP interface */ +char *ip6prefix = NULL; /* Prefix for global /48 IPv6 subnet */ char *wan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */ char *qos_leaf = "sfq perturb 5"; /* leaf discipline */ char *qos_free_zone = NULL; /* QoS free zone */ -int qos_proxy = 1; /* include proxy port to QoS */ -int found_lmsid = 0; /* show links to users in LMS information system */ -int include_upload = 1; /* upload+download=total traffic */ +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 */ char *proxy_ip = "192.168.1.1/32"; /* our IP with proxy port */ int proxy_port = 3128; /* proxy port number */ long long int line = 1024; /* WAN/ISP download in kbps */ @@ -146,6 +113,8 @@ int burst_main = 64; int burst_group = 32; int magic_treshold = 8; /* reduce ceil by X*magic_treshhold kbps (hard shaping) */ int keywordcount = 0; +int class_count = 0; +int ip_count = 0; /* not yet implemented: int fixed_packets = 0; maximum number of pps per IP address (not class!) int packet_limit = 5; maximum number of pps to htn CEIL, not rate !!! @@ -160,40 +129,43 @@ 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! https://dev.arachne.cz/svn/cll1h ==== */ +struct IP *ips = NULL, *ip, *sharedip; +struct Group *groups = NULL, *group; +struct Keyword *keyword, *defaultkeyword=NULL, *keywords=NULL; -struct IP -{ - char *addr; - char *name; - char *sharing; - int min; - int desired; - int max; - int mark; - int prio; - int fixedprio; - int group; - int lmsid; - unsigned long long direct; - unsigned long long proxy; - unsigned long long upload; - unsigned long long traffic; - unsigned long long credit; - unsigned long pktsup; - unsigned long pktsdown; - struct Keyword *keyword; - list(IP); -} *ips=NULL, *ip, *sharedip; - -struct Group +void help(void); +/* implemented in help.c */ + +void get_traffic_statistics(const char *whichiptables); +/* implemented in parseiptables.c */ + +void parse_ip_log(int argc, char **argv); +/* implemented in parselog.c */ + +void parse_hosts(char *hosts); +/* implemented in parsehosts.c */ + +void write_json_traffic(char *json); +/* implemented in json.c */ + +void write_htmlandlogs(char *html, char *d, int total, int just_preview); +/* implemented in htmlandlogs.c */ + +const char *tr_odd_even(void) { - int min; - int count; - int desired; - int id; - list(Group); -} *groups=NULL, *group; + row_odd_even = 1 - row_odd_even; + if(row_odd_even) + { + return "\n"; + } + else + { + return "\n"; + } +} + +/* ==== This is C<<1 stuff - learn C<<1 first! https://dev.arachne.cz/svn/cll1h ==== */ +/* (except that this code uses obsolete, archaic version of this header file...) */ struct Index { @@ -205,155 +177,16 @@ struct Index list(Index); } *idxs=NULL, *idx, *metaindex; -struct Keyword -{ - char *key; - - int asymetry_ratio; /* ratio for ADSL-like upload */ - int asymetry_fixed; /* fixed treshold for ADSL-like upload */ - int data_limit; /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */ - int data_prio; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */ - long fixed_limit; /* fixed data limit for setting lower HTB ceil */ - long fixed_prio; /* fixed data lmit for setting lower HTB prio */ - int reserve_min; /* bonus for nominal HTB rate bandwidth (in kbps) */ - int reserve_max; /* malus for nominal HTB ceil (in kbps) */ -// int divide_max; /* relative malus: new_ceil=rate+(old_ceil-rate)/divide_max */ -// int htb_ceil_bonus_divide; /* relative bonus: new_ceil=old_ceil+old_ceil/htb_ceil_bonus_divide */ - int default_prio; /* default HTB priority for this keyword */ - char *html_color; - int ip_count; - char *leaf_discipline; - - list(Keyword); -} *keyword,*defaultkeyword=NULL,*keywords=NULL; - -/* Damned, this must be object oriented! This looks almost like constructor ;-) */ - -void TheIP(void) -{ - create(ip,IP); - ip->name = ""; - ip->addr = ""; - ip->sharing = NULL; - ip->prio = highest_priority+1; - ip->lmsid = -1; - ip->fixedprio = \ - ip->mark = \ - ip->min = \ - ip->max = \ - ip->desired = \ - ip->credit = \ - ip->upload = \ - ip->proxy = \ - ip->direct = \ - ip->traffic = \ - ip->pktsup = \ - ip->pktsdown = 0; - ip->keyword = keywords; - push(ip,ips); -} /* ====== iptables indexes are used to reduce complexity to log8(N) ===== */ -char *very_ugly_ipv4_code(char *inip,int bitmask,int format_as_chainname) -{ - /* warning: this function was debugged only for bitmask values 20,24,28 !!!*/ - int dot=0, n; - char *ip,*outip,*outptr,*fmt; +char *index_id(char *ip, int bitmask); +/* function implemented in ipv4subnets.c */ - duplicate(inip,ip); - /* debug printf("(%s,%d) -> ",ip,bitmask); */ +char *subnet_id(char *ip, int bitmask); +/* function implemented in ipv4subnets.c */ - if(ip && *ip && bitmask>=0 && bitmask<=32) - { - string(outip,strlen(ip)+10); /*fuck unicode? assertion: 10>strlen("_%d_%d") */ - } - else - { - /* should never exit here */ - return "undefined"; - } - outptr=outip; - while(ip && *ip) - { - if(*ip=='.') - { - if(dot<(bitmask/8-1)) - { - if(format_as_chainname) - { - *outptr='_'; - } - else - { - *outptr='.'; - } - outptr++; - dot++; - } - else - { - char *cutdot=strchr(ip+1,'.'); /*for bitmask<24*/ - if(cutdot) - { - *cutdot = '\0'; - } - - if(format_as_chainname) - { - fmt = "_%d_%d"; - } - else - { - fmt = ".%d"; - } - - if(bitmask%8) - { - n = atoi(ip+1)-atoi(ip+1)%(1<<(8-bitmask%8)); - } - else - { - n = 0; - } - - /*debug printf("%d/%d => [_%d_%d]\n",atoi(ip+1),bitmask,n,bitmask); */ - sprintf(outptr,fmt,n,bitmask); - if(!format_as_chainname) - { - while(bitmask<24) - { - strcat(outip,".0"); - bitmask+=8; - } - } - /* debug printf("[%s]\n",outip); */ - return outip; - } - } - else - { - *outptr=*ip; - outptr++; - } - ip++; - } - /*should never exit here*/ - *outptr='\0'; - return outip; -} - -char *hash_id(char *ip,int bitmask) -{ - return very_ugly_ipv4_code(ip,bitmask,1); -} - -char *subnet_id(char *ip,int bitmask) -{ - return very_ugly_ipv4_code(ip,bitmask,0); -} - -/* ================= Let's parse configuration file here =================== */ +/* ================= Let's parse configuration file here ================ */ void reject_config_and_exit(char *filename) { @@ -389,7 +222,10 @@ void get_config(char *config_filename) keyword->leaf_discipline=""; push(keyword,keywords); - if(!defaultkeyword) defaultkeyword=keyword; + if(!defaultkeyword) + { + defaultkeyword=keyword; + } keywordcount++; kwd=NULL; @@ -428,12 +264,17 @@ void get_config(char *config_filename) option("tc",tc); option("iptables",iptables); - option("iptables-save",iptablessave); /* new */ - option("iptables-restore",iptablesrestore); /* new */ - option("iptables-in-filename",iptablesfile); /* new */ + option("iptables-save",iptablessave); + option("iptables-restore",iptablesrestore); + option("ip6tables",ip6tables); + option("ip6tables-save",ip6tablessave); + option("ip6tables-restore",ip6tablesrestore); + option("iptables-in-filename",iptablesfile); + option("ip6tables-in-filename",ip6tablesfile); option("hosts",hosts); option("lan-interface",lan); option("wan-interface",wan); + option("ip6-prefix",ip6prefix); option("lan-medium",lan_medium); option("wan-medium",wan_medium); lloption("wan-download",line); @@ -441,7 +282,7 @@ void get_config(char *config_filename) ioption("hall-of-fame-enable",hall_of_fame); option("hall-of-fame-title",title); option("hall-of-fame-filename",html); - option("json-filename",json); + option("json-filename",json_traffic); option("hall-of-fame-preview",preview); option("json-preview",json_preview); option("log-filename",cmdlog); @@ -513,155 +354,6 @@ void get_config(char *config_filename) } } -/* ===================== traffic analyser - uses iptables ================ */ - -void get_traffic_statistics(void) -{ - char *str,*cmd; - int downloadflag=0; - - textfile(Pipe,str) *line,*lines=NULL; - string(str,STRLEN); - string(cmd,STRLEN); - - sprintf(cmd,"%s -L -v -x -n -t mangle",iptables); - shell(cmd); - input(str,STRLEN) - { - create(line,Pipe); - line->str=str; - string(str,STRLEN); - append(line,lines); - } - - for_each(line,lines) - { - int col, accept=0,proxyflag=0,valid=1,setchainname=0,commonflag=0; - unsigned long long traffic=0; - unsigned long pkts=0; - char *ipaddr=NULL,*ptr; - - /* debug puts(line->str); */ - valid_columns(ptr,line->str,' ',col) - if(valid) switch(col) - { - case 1: if(eq(ptr,"Chain")) - { - setchainname=1; - } - else if(eq(ptr,"pkts")) - { - valid=0; - } - else - { - sscanf(ptr,"%lu",&pkts); - } - break; - case 2: if(setchainname) - { - if(!strncmp(ptr,"post_",5) || eq(ptr,"POSTROUTING")) - { - downloadflag = 1; - } - else - { - if(!strncmp(ptr,"forw_",5) || eq(ptr,"FORWARD")) - { - downloadflag = 0; - } - } - if(eq(ptr,"post_common") || eq(ptr,"forw_common")) - { - commonflag = 1; - } - } - else - { - sscanf(ptr,"%Lu",&traffic); - traffic += (1<<19); - traffic >>= 20; - } - break; - case 3: if((strncmp(ptr,"post_",5) && strncmp(ptr,"forw_",5)) || commonflag) - { - accept=eq(ptr,mark); - } - /*if(filter_type==1) accept=eq(ptr,"MARK"); else accept=eq(ptr,"CLASSIFY");*/ - break; - case 8: if(downloadflag) - { - if(strstr(proxy_ip,ptr)) - { - proxyflag=1; - } - } - else - { - ipaddr=ptr; - } - break; - case 9: if(downloadflag)ipaddr=ptr;break; - } - - if(accept && traffic>0 && ipaddr) - { - if(proxyflag) - { - printf("(proxy) "); - } - else if(!downloadflag) - { - printf("(upload) "); - } - printf("IP %s: %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts); - - if_exists(ip,ips,eq(ip->addr,ipaddr)); - else - { - TheIP(); - ip->addr=ipaddr; - if(eq(ip->addr,"0.0.0.0/0")) - { - ip->name="(unregistered)"; - ip->min=free_min; - ip->max=ip->desired=free_max; - } - } - - if(downloadflag) - { - if(proxyflag) - { - ip->proxy=traffic; - } - else - { - ip->traffic+=traffic; - } - ip->direct=ip->traffic-ip->upload-ip->proxy; - ip->pktsdown=pkts; - } - else - { - ip->upload=traffic; - ip->pktsup=pkts; - if(include_upload) - { - ip->traffic+=traffic; - } - else - { - if(traffic>ip->traffic) - { - ip->traffic=traffic; - } - } - } - } - } - free(cmd); -} /* ========== This function executes, logs OR ALSO prints command ========== */ @@ -712,57 +404,6 @@ void run_restore(void) free(restor); } -/* == This function strips extra characters after IP address and stores it = */ - -void parse_ip(char *str) -{ - char *ptr,*ipaddr=NULL,*ipname=NULL,*lmsid=NULL; - - ptr=strchr(str,'{'); - if(ptr) - { - lmsid=++ptr; - while(*ptr && *ptr!='}') - { - ptr++; - } - *ptr=0; - } - - ptr=str; - while(*ptr && *ptr!=' ' && *ptr!=9) - { - ptr++; - } - - *ptr=0; - ipaddr=str; - ptr++; - while(*ptr && (*ptr==' ' || *ptr==9)) - { - ptr++; - } - ipname=ptr; - while(*ptr && *ptr!=' ' && *ptr!=9) - { - ptr++; - } - *ptr=0; - - if_exists(ip,ips,eq(ip->addr,ipaddr)); - else - { - TheIP(); - } - ip->addr=ipaddr; - ip->name=ipname; - if(lmsid) - { - ip->lmsid=atoi(lmsid); - found_lmsid=1; - } -} - char *parse_datafile_line(char *str) { char *ptr=strchr(str,' '); @@ -780,31 +421,6 @@ char *parse_datafile_line(char *str) } - - -void append_log(struct IP *self) /*using global variables*/ -{ - char *d, *str; - FILE *f; - - date(d); /* this is typical cll1.h macro - prints current date */ - string(str,STRLEN); - sprintf(str,"%s/%s.log", log_dir, self->name); - f=fopen(str,"a"); - if(f > 0) - { - fprintf(f,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s", - time(NULL), self->name, self->traffic, self->direct, self->proxy, - self->upload, self->min, self->max, self->desired, self->lmsid, d); /* d = date*/ - fclose(f); - } - else - { - perror(str); - } -} - - /*-----------------------------------------------------------------*/ /* Are you looking for int main(int argc, char **argv) ? :-)) */ /*-----------------------------------------------------------------*/ @@ -815,15 +431,15 @@ program FILE *f=NULL; /* everything is just stream of bytes... */ char *str, *ptr, *d; /* LET A$=B$ :-) */ char *substring; - int class_count=0,ip_count=0; - int parent=1; - 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 just_logs=FALSE; /* just parse logs */ - int run=FALSE; - int total=0; + + int parent = 1; + 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 just_logs = FALSE; /* just parse logs */ + int run = FALSE; + int total = 0; char *chain_forward, *chain_postrouting; char *althosts=NULL; @@ -888,113 +504,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /*-----------------------------------------------------------------*/ puts("Parsing iptables verbose output ..."); /*-----------------------------------------------------------------*/ - get_traffic_statistics(); + get_traffic_statistics(iptables); } /*-----------------------------------------------------------------*/ printf("Parsing class defintion file %s ...\n", hosts); /*-----------------------------------------------------------------*/ - int groupidx = FIRSTGROUPID; - parse(hosts) - { - str=_; - - if(*str<'0' || *str>'9') - { - /* any line starting with non-number is comment ...*/ - continue; - } - - //Does this IP share QoS class with some other ? - substring=strstr(str,"sharing-"); - if(substring) - { - substring+=8; //"sharing-" - parse_ip(str); - ip_count++; - ip->sharing=substring; - ip->keyword=defaultkeyword; /* settings for default keyword */ - while(*substring && *substring!='\n') - { - substring++; - } - *substring=0; - } - else - { - //Do we have to create new QoS class for this IP ? - - if_exists(keyword,keywords,(substring=strstr(str,keyword->key))) - { - parse_ip(str); - ip_count++; - ip->keyword=keyword; - keyword->ip_count++; - ip->prio=keyword->default_prio; - substring+=strlen(keyword->key)+1; - ptr=substring; - while(*ptr && *ptr!='-') - { - ptr++; - } - if(*ptr=='-') - { - *ptr=0; - ip->max = ip->desired=atoi(ptr+1); - } - ip->min = atoi(substring); - if(ip->min <= 0) - { - printf(" %s: Illegal value of minimum bandwidth 0 kbps, using %d kb/s\n", - str, free_min); - ip->min = free_min; - } - if(ip->max <= ip->min) - { - ip->fixedprio = 1; - ip->max = ip->min+ip->keyword->reserve_min; - } - else - { - ip->max -= ip->keyword->reserve_max; - if(ip->maxmin) - { - ip->max=ip->min; - } - } - ip->mark=FIRSTIPCLASS+1+class_count++; - - if_exists(group,groups,group->min==ip->min) - { - group->count++; - group->desired += ip->min; - ip->group = group->id; - } - else - { - create(group,Group); - group->min = ip->min; - group->id = groupidx++; - ip->group = group->id; - - if(group->min<8) group->min=8; - /* Warning - this is maybe because of primitive tc namespace, can be fixed */ - /* it is because class IDs are derived from min. bandwidth. - xCh */ - //if(group->min>MAX_GUARANTED_KBPS) group->min=MAX_GUARANTED_KBPS; - - group->count=1; - group->desired=ip->min; - insert(group,groups,desc_order_by,min); - } - }//endif keyword- - }//endif sharing- - } - fail - { - perror(hosts); - exit(-1); - } - done; /* ugly macro end */ + parse_hosts(hosts); /*-----------------------------------------------------------------*/ /* cll1.h - let's allocate brand new character buffer... */ @@ -1014,7 +530,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); ip->lmsid=sharedip->lmsid; break; } - if(!sharedip) + if(not sharedip) { printf("Unresolved shared connection: %s %s sharing-%s\n", ip->addr, ip->name, ip->sharing); @@ -1046,17 +562,17 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); puts("Initializing iptables and tc classes ..."); /*-----------------------------------------------------------------*/ - iptables_file=fopen(iptablesfile,"w"); + iptables_file = fopen(iptablesfile, "w"); if(iptables_file == NULL) { - puts("Cannot open iptablesfile!"); + perror(iptablesfile); exit(-1); } - log_file=fopen(cmdlog,"w"); + log_file = fopen(cmdlog, "w"); if(log_file == NULL) { - puts("Cannot open logfile!"); + perror(cmdlog); exit(-1); } @@ -1082,11 +598,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); if(qos_proxy) { save_line(":post_noproxy - [0:0]"); - sprintf(str,"-A POSTROUTING -p ! tcp -o %s -j post_noproxy", lan); + sprintf(str,"-A POSTROUTING ! -p tcp -o %s -j post_noproxy", lan); save_line(str); - sprintf(str,"-A POSTROUTING -s ! %s -o %s -j post_noproxy", proxy_ip, lan); + sprintf(str,"-A POSTROUTING ! -s %s -o %s -j post_noproxy", proxy_ip, lan); save_line(str); - sprintf(str,"-A POSTROUTING -s %s -p tcp --sport ! %d -o %s -j post_noproxy", proxy_ip, proxy_port, lan); + sprintf(str,"-A POSTROUTING -s %s -p tcp ! --sport %d -o %s -j post_noproxy", proxy_ip, proxy_port, lan); save_line(str); chain="post_noproxy"; @@ -1100,7 +616,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); save_line(str); } - if(ip_count>idxtable_treshold1 && !just_flush) + if(ip_count > idxtable_treshold1 && !just_flush) { int idxcount=0, bitmask=32-idxtable_bitmask1; /* default net mask: 255.255.255.240 */ char *subnet, *buf; @@ -1111,9 +627,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); save_line(":post_common - [0:0]"); save_line(":forw_common - [0:0]"); - for_each(ip,ips) if(ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0")) + for_each(ip,ips) if(ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0") && !strchr(ip->addr,':')) /* only IPv4 */ { - buf=hash_id(ip->addr,bitmask); + buf=index_id(ip->addr,bitmask); if_exists(idx,idxs,eq(idx->id,buf)) { idx->children++; @@ -1132,14 +648,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } /* brutal perfomance optimalization */ - while(idxcount>idxtable_treshold2 && bitmask>2*idxtable_bitmask2) + while(idxcount > idxtable_treshold2 && bitmask > 2*idxtable_bitmask2) { - bitmask-=idxtable_bitmask2; - idxcount=0; + bitmask -= idxtable_bitmask2; + idxcount = 0; for_each(idx,idxs) if(idx->parent == NULL) { - buf=hash_id(idx->addr,bitmask); + buf = index_id(idx->addr,bitmask); if_exists(metaindex,idxs,eq(metaindex->id,buf)) { metaindex->children++; @@ -1159,7 +675,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } } - /* this should slightly optimize throughout ... */ + /* this should slightly optimize throughput ... */ sort(idx,idxs,desc_order_by,children); sort(idx,idxs,order_by,bitmask); @@ -1313,13 +829,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); for_each(ip, ips) if(ip->min == group->min && ip->max > ip->min) { - if( ip->keyword->data_limit && !ip->fixedprio - && ( ip->traffic>ip->credit - + (ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))) ) + ip->realquota=ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)); + if( ip->keyword->data_limit + and not ip->fixedprio + and ip->traffic > ip->realquota ) { - if(group_ratemax) + if(group_rate < ip->max) { - ip->max=group_rate; + ip->max = group_rate; } group_rate+=magic_treshold; ip->prio=lowest_priority; @@ -1404,421 +921,21 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); done; /* ugly macro end */ } html=preview; - json=json_preview; + json_traffic=json_preview; } if(!dry_run && !just_flush) { /*-----------------------------------------------------------------*/ - printf("Writing json overview %s ... ", json); + printf("Writing json traffic overview %s ... ", json_traffic); /*-----------------------------------------------------------------*/ - f=fopen(json, "w"); - if(f > 0) - { - int jsoncount=0; - fprintf(f, "{\n"); - for_each(ip, ips) - { - if( ip->lmsid > 0 - && (ip->traffic || ip->direct || ip->proxy || ip->upload)) - { - if(jsoncount) - { - fprintf(f, ",\n"); - } - fprintf(f, " \"%s\":{ \"lms\": %d, \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu, \"min\":%d, \"max\":%d, \"limit\":%d }", - ip->name, ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload, ip->min, ip->desired, ip->max); - jsoncount++; - } - } - fprintf(f, "}\n"); - fclose(f); - puts("done."); - } - else - { - perror(json); - } - } - - f=fopen(html,"w"); - if(f > 0) - { - int count=1; - i=0; - - /*-----------------------------------------------------------------*/ - printf("Sorting data and generating statistics page %s ...\n", html); - /*-----------------------------------------------------------------*/ - - if(use_jquery_popups) - { - fprintf(f,"\n", jquery_url); - } - fputs("\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n",f); - fprintf(f,"\n", keywordcount); - fputs("\n",f); - - row_odd_even = 0; - for_each(group, groups) - { -#ifdef DEBUG - printf("%d kb/s group: %d bandwidth requested: %d kb/s\n",group->min,group->count,group->desired); -#endif - fprintf(f, "%s", - tr_odd_even(), count, group->min); - fprintf(f, "", - group->count, group->desired); - - for_each(keyword, keywords) if(keyword->ip_count) - { - fprintf(f,"", - keyword->html_color, group->min*keyword->data_limit); - } - i += group->desired; - total += group->count; - count++; - } -#ifdef DEBUG - printf("Total groups: %d Total bandwidth requested: %d kb/s\nAGGREGATION: 1/%d\n", - count, i, i/line); -#endif - fprintf(f,"\n\ -\n\ -",keyword->ip_count); - } - fprintf(f,"\n", (int)(0.5+i/line)); - fprintf(f,"\n", keywordcount, total); - - fputs("
Bandwidth classes
#groupIPsrequesteddata limits
%d%d kb/s%d%d kb/s%d MB
Line %Ld kb/s",line); - fprintf(f,"%d%d kb/s",total,i); - - for_each(keyword, keywords) if(keyword->ip_count) - { - fprintf(f,"%d IPs
Aggregation 1/%d%d traffic classes
\n",f); - } - else if(!dry_run && !just_flush) - { - perror(html); + write_json_traffic(json_traffic); } - i=0; - if(f > 0) - { - unsigned long long total_traffic=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0; - int active_classes=0; - int colspan=12; - struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums=NULL; - int limit_count=0, prio_count=0; - int popup_button=0; - - if(qos_proxy) - { - colspan++; - } - - fprintf(f,"

\n\n", d); - fputs("\n\n",f); - fputs("\n\ -\n\ -\n\ -\n",f); - if(qos_proxy) - { - fputs("\n",f); - } - fputs("\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n",f); - - row_odd_even = 0; - for_each(ip,ips) if(!use_jquery_popups || !ip->sharing) - { - char *f1="", *f2=""; - i++; - - if(ip->max < ip->desired) - { - f1=""; - f2=""; - limit_count++; - } - else if(ip->prio > highest_priority+1) - { - f1=""; - f2=""; - prio_count++; - } - -#ifdef DEBUG - printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); -#endif - /* hostnames -------------------------------------- */ - fprintf(f,"%s\n",f); - /* ----------------------------------------------- */ - - if(found_lmsid) - { - fputs("\n",f); - } - fprintf(f,"\n", ip->credit); - fprintf(f,"", - ip->keyword->html_color, - ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))); - fprintf(f,"\n",f); - /* ----------------------------------------------- */ - - if(qos_proxy) - { - fprintf(f,"\n", ip->proxy); - } - /* upload ---------------------------------------- */ - fprintf(f,"\n",f); - /* ----------------------------------------------- */ - - fprintf(f,"\n\ -\n\ -\n\ -\n", - ip->min, ip->desired, - f1, ip->max, f2, - f1, ip->prio, f2); - - total_traffic+=ip->traffic; - total_direct+=ip->direct; - total_proxy+=ip->proxy; - total_upload+=ip->upload; - if(ip->traffic>0) - { - active_classes++; - tmp_sum+=ip->traffic; - create(sum,Sum); - sum->l=tmp_sum; - sum->i=active_classes; - insert(sum,sums,order_by,i); - } - - if(!just_preview) - { - append_log(ip); - for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing)) - { - append_log(sharedip); - } - } - } - fprintf(f,"\n\ -", colspan-7, i); - fprintf(f,"\n", total_traffic, total_direct); - if(qos_proxy) - { - fprintf(f,"\n", total_proxy); - } - fprintf(f,"", total_upload); - fprintf(f,"\n
%s",title); - fprintf(f," (%s)
 creditFUPtotaldownproxyupminmaxlimit 
#hostname [+sharing]LMSMBMBMBMBMBkb/skb/skb/sprio
%d%s\n", - tr_odd_even(), ip->name, i, log_url, ip->name, ip->name); - - if(use_jquery_popups) - { - fprintf(f,"",i); - popup_button=0; - for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing)) - { - fprintf(f,"
%s\n", log_url, sharedip->name, sharedip->name); - popup_button++; - } - fputs("\n",f); - if(popup_button) - { - fprintf(f,"[+%d]", - i, i, i, popup_button); - } - } - fputs("		",f); - if(ip->lmsid > 0) - { - fprintf(f,"%04d\n", lms_url, ip->lmsid, ip->lmsid); - } - else if(ip->lmsid == 0) - { - fputs("-------",f); - } - fputs("%Lu%Lu%s%Lu%s", f1, ip->traffic, f2); - - /* download --------------------------------------- */ - fprintf(f,"%Lu", ip->direct); - if(use_jquery_popups) - { - fprintf(f,"",i); - for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing)) - { - fprintf(f,"
%Lu", sharedip->direct); - } - fputs("\n",f); - } - fputs("		%Lu%Lu", ip->upload); - if(use_jquery_popups) - { - fprintf(f,"",i); - for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing)) - { - fprintf(f,"
%Lu", sharedip->upload); - } - fputs("\n",f); - } - fputs("		%d%d%s%d%s%s%d%s
%d CLASSES%Lu%Lu%Lu%LuLIMIT %dx LOW-PRIO %dx
\n",limit_count,prio_count); - - row_odd_even = 0; - if(active_classes>10) - { - int top20_count=0,top20_perc1=0; - long long top20_perc2=0; - unsigned long long top20_sum=0l; - - fputs("

\n",f); - fputs("\n\ -\n\ -\n\ -\n\ -\n",f); - - if_exists(sum,sums,sum->l>=total_traffic/4) - { - fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - sum->i, (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic); - } - - if_exists(sum,sums,sum->i==10) - { - fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic); - } - - if_exists(sum,sums,sum->l>=total_traffic/2) - { - fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); - } - - if_exists(sum,sums,sum->l>=4*total_traffic/5) - { - fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); - } - - if_exists(sum,sums,sum->i>=(active_classes+1)/5) - { - fprintf(f,"%s\n", tr_odd_even()); - top20_count=sum->i; - top20_perc1=(100*sum->i+50)/active_classes; - top20_sum=sum->l; - top20_perc2=(100*sum->l+50)/total_traffic; - fprintf(f,"\n\ -\n\ -\n\ -\n", - top20_count,top20_perc1,top20_sum,top20_perc2); - } - - if_exists(sum,sums,sum->i>=(active_classes+1)/4) - { - fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); - } - - if_exists(sum,sums,sum->i>=(active_classes+1)/2) - { - fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); - } - - if_exists(sum,sums,sum->i>=4*(active_classes+1)/5) - { - fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); - } - - fprintf(f,"\n", log_url); - fprintf(f,"\n\ -\n\ -\n\ -\n",active_classes,total_traffic); - fputs("
Enterprise Resource Planning (ERP)
Analytic categoryActive ClassesData transfers
Top 25%% of traffic%d%d %%%Lu MB%Ld %%
Top 10 downloaders10%d %%%Lu MB%Ld %%
Top 50%% of traffic%d%d %%%Lu MB%Ld %%
Top 80%% of traffic%d%d %%%Lu MB%Ld %%
Top 20%% downloaders%d%d %%%Lu MB%Ld %%
Top 25%% downloaders%d%d %%%Lu MB%Ld %%
Top 50%% downloaders%d%d %%%Lu MB%Ld %%
Top 80%% downloaders%d%d %%%Lu MB%Ld %%
All users, all traffic%d100 %%%Lu MB100 %%
\n", f); - - /* write basic ERP data to log directory */ - if(!just_preview) - { - FILE *iplog; - sprintf(str,"%s/ERP.log",log_dir); - iplog=fopen(str,"a"); - if(iplog) - { - fprintf(iplog,"%ld\t%d\t%d %%\t%Lu M\t%Ld %%\tACTIVE %d\tTRAFFIC %Lu M\tCLASSES %d\tFUP-LIMIT %d\tLOW-PRIO %d\t%s", - time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, - active_classes, total_traffic, i, limit_count, prio_count, d); /* d = date*/ - fclose(iplog); - } - else - { - perror(str); - } - } - } - - fprintf(f, stats_html_signature, version); - fclose(f); - } + /*-----------------------------------------------------------------*/ + printf("Writing statistics into HTML page %s ...\n", html); + /*-----------------------------------------------------------------*/ + write_htmlandlogs(html, d,total, just_preview); if(just_preview) { @@ -1847,13 +964,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); puts("Generating iptables and tc classes ... "); /*-----------------------------------------------------------------*/ - for_each(ip, ips) if(ip->mark > 0) + for_each(ip, ips) if(ip->mark > 0 && !strchr(ip->addr,':')) /* works only for IPv4 so far */ { if(idxs) { char *buf; duplicate(ip->addr,buf); - buf=hash_id(ip->addr,32-idxtable_bitmask1); + buf=index_id(ip->addr,32-idxtable_bitmask1); string(chain_forward,6+strlen(buf)); strcpy(chain_forward,"forw_");