X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=03b75543d8964c125fc87c03b48995d74505b162;hp=814da9e4cb0fe9de6527fb98ad4e216d357961ba;hb=64b2d1255780905c78973df33145c93ee5613c9c;hpb=1ab008b9af1556f1bcba85b2d262fa83b617f01e diff --git a/prometheus.c b/prometheus.c index 814da9e..03b7554 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, 20121011 +/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* 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-2014 Michael Polak, Arachne Aerospace */ +/* iptables-restore support Copyright(C) 2007-2008 ludva */ +/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */ +/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + +/* Modified by: xChaos, 20140812 ludva, 20080415 Prometheus QoS is free software; you can redistribute it and/or @@ -26,56 +26,41 @@ GNU General Public License is located in file COPYING */ -#define STRLEN 512 -#undef DEBUG - #include "cll1-0.6.2.h" #include "ipstruct.h" -const char *version = "0.8.3-g"; +const char *version = "0.8.5-b"; -/* 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-2014 Michael Polak, Arachne Labs\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"); -} +#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 *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 */ char *classmap = "/var/lib/misc/prometheus.classes"; /* credit log file */ char *html = "/var/www/traffic.html"; /* hall of fame - html version */ @@ -89,64 +74,76 @@ 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; /* */ /* === Configuraration file values defaults - stored in global variables ==== */ int filter_type = 1; /*1 mark, 2 classify*/ +char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */ 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]"; +char *ip6preamble = "-A FORWARD -p ipv6-icmp -j ACCEPT\n-A POSTROUTING -p ipv6-icmp -j ACCEPT\n-A FORWARD -s fe80::/10 -j ACCEPT\n-A FORWARD -d ff00::/8 -j ACCEPT\n-A POSTROUTING -s fe80::/10 -j ACCEPT\n-A POSTROUTING -d ff00::/8 -j ACCEPT"; FILE *iptables_file = NULL; -int enable_credit = 1; /* enable credit file */ -int use_credit = 0; /* use credit file (if enabled)*/ +FILE *ip6tables_file = NULL; +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 */ -char *proxy_ip = "192.168.1.1/32"; /* our IP with proxy port */ -int proxy_port = 3128; /* proxy port number */ +/* 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 */ long long int up = 1024; /* WAN/ISP upload in kbps */ -int free_min = 32; /* minimum guaranted bandwidth for all undefined hosts */ -int free_max = 64; /* maximum allowed bandwidth for all undefined hosts */ +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 */ +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; 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 !!! -*/ +int class_count = 0; +int ip_count = 0; 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 */ 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; +struct Keyword *keyword, *defaultkeyword=NULL, *keywords = NULL; +struct Macro *macro, *macros = NULL; + +#define FREE_CLASS 3 +#define OVERLIMIT_CLASS 4 + +void help(void); +/* implemented in help.c */ + +void get_traffic_statistics(const char *whichiptables, int ipv6); +/* implemented in parseiptables.c */ void parse_ip_log(int argc, char **argv); /* implemented in parselog.c */ @@ -157,6 +154,13 @@ void parse_hosts(char *hosts); 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 */ + +void analyse_topology(char *traceroute); +/* implemented in networks.c */ + + const char *tr_odd_even(void) { row_odd_even = 1 - row_odd_even; @@ -171,6 +175,7 @@ const char *tr_odd_even(void) } /* ==== 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 { @@ -179,11 +184,10 @@ struct Index struct Index *parent; int bitmask; int children; + int ipv6; list(Index); } *idxs=NULL, *idx, *metaindex; -void TheIP(void); -/* function implemented in parsehosts.c */ /* ====== iptables indexes are used to reduce complexity to log8(N) ===== */ @@ -193,6 +197,12 @@ char *index_id(char *ip, int bitmask); char *subnet_id(char *ip, int bitmask); /* function implemented in ipv4subnets.c */ +char *index6_id(char *ip, int bitmask); +/* function implemented in ipv6subnets.c */ + +char *subnet6_id(char *ip, int bitmask); +/* function implemented in ipv6subnets.c */ + /* ================= Let's parse configuration file here ================ */ void reject_config_and_exit(char *filename) @@ -214,22 +224,26 @@ 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); - if(!defaultkeyword) defaultkeyword=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 = ""; + keyword->allowed_avgmtu = 0; + + push(keyword, keywords); + if(!defaultkeyword) + { + defaultkeyword = keyword; + } keywordcount++; kwd=NULL; @@ -244,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); + foption("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 || @@ -268,12 +283,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); @@ -296,12 +316,14 @@ void get_config(char *config_filename) ioption("use-jquery-popups",use_jquery_popups); option("qos-free-zone",qos_free_zone); ioption("qos-free-delay",qos_free_delay); - ioption("qos-proxy-enable",qos_proxy); - option("qos-proxy-ip",proxy_ip); +/* ioption("qos-proxy-enable",qos_proxy); */ +/* option("qos-proxy-ip",proxy_ip);*/ option("htb-leaf-discipline",qos_leaf); - ioption("qos-proxy-port",proxy_port); +/* 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); @@ -326,10 +348,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")) @@ -353,155 +375,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 ========== */ @@ -521,12 +394,19 @@ void safe_run(char *cmd) } } -void save_line(char *line) +void iptables_save_line(char *line, int ipv6) { - fprintf(iptables_file,"%s\n",line); + if(ipv6) + { + fprintf(ip6tables_file,"%s\n",line); + } + else + { + fprintf(iptables_file,"%s\n",line); + } } -void run_restore(void) +void run_iptables_restore(void) { char *restor; string(restor,STRLEN); @@ -534,8 +414,8 @@ void run_restore(void) /*-----------------------------------------------------------------*/ printf("Running %s <%s ...\n", iptablesrestore, iptablesfile); /*-----------------------------------------------------------------*/ - - save_line("COMMIT"); + + iptables_save_line("COMMIT", FALSE); fclose(iptables_file); if(dry_run) { @@ -548,18 +428,44 @@ void run_restore(void) sprintf(restor,"%s <%s",iptablesrestore, iptablesfile); safe_run(restor); - + + if(ip6prefix) + { + /*-----------------------------------------------------------------*/ + printf("Running %s <%s ...\n", ip6tablesrestore, ip6tablesfile); + /*-----------------------------------------------------------------*/ + iptables_save_line("COMMIT", TRUE); + fclose(ip6tables_file); + if(dry_run) + { + parse(ip6tablesfile) + { + printf("%s\n",_); + } + done; /* ugly macro end */ + } + sprintf(restor,"%s <%s",ip6tablesrestore, ip6tablesfile); + safe_run(restor); + } free(restor); } 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 @@ -568,27 +474,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) ? :-)) */ @@ -599,23 +484,26 @@ program int i=0; /* just plain old Fortran style integer :-) */ FILE *f=NULL; /* everything is just stream of bytes... */ char *str, *ptr, *d; /* LET A$=B$ :-) */ - char *substring; - - 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 *substring, *limit_pkts; + + 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; char *chain_forward, *chain_postrouting; char *althosts=NULL; printf("\n\ Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\ -Version %s - Copyright (C)2005-2012 Michael Polak, Arachne Labs\n\ +Version %s - Copyright (C)2005-2014 Michael Polak, Arachne Labs\n\ iptables-restore & burst tunning & classify modification by Ludva\n\ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); @@ -628,9 +516,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; } @@ -665,7 +557,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); if(althosts) { - hosts=althosts; + hosts = althosts; } if(just_flush<9) @@ -673,30 +565,78 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /*-----------------------------------------------------------------*/ puts("Parsing iptables verbose output ..."); /*-----------------------------------------------------------------*/ - get_traffic_statistics(); + get_traffic_statistics(iptables, FALSE); + if(ip6prefix) + { + /*-----------------------------------------------------------------*/ + puts("Parsing ip6tables verbose output ..."); + /*-----------------------------------------------------------------*/ + get_traffic_statistics(ip6tables, TRUE); + } } /*-----------------------------------------------------------------*/ - printf("Parsing class defintion file %s ...\n", hosts); + /* cll1.h - let's allocate brand new character buffer... */ /*-----------------------------------------------------------------*/ - parse_hosts(hosts); + string(str, STRLEN); + string(limit_pkts, STRLEN); /*-----------------------------------------------------------------*/ - /* cll1.h - let's allocate brand new character buffer... */ + printf("Parsing macro definition file %s ...\n", macrosfile); /*-----------------------------------------------------------------*/ - string(str,STRLEN); + 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); + /*-----------------------------------------------------------------*/ + 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; + ip->pps_limit = sharedip->pps_limit; /* no other way to do this */ + + /* Ugly hack: append IPv4 addresses of sharedip to IPv6 uplinks */ + ptr = strchr(ip->addr, '+'); + if(ptr && ptr-ip->addr > 1 && !sharedip->v6) + { + *(--ptr) = 0; + concatenate(ip->addr, sharedip->addr, ptr); + ip->name = ip->addr = ptr; + ptr = strchr(ip->addr, '.'); + while(ptr && *ptr) + { + *ptr = ':'; + ptr = strchr(ptr, '.'); + } + ip->mask += 64; + } + break; } if(not sharedip) @@ -713,7 +653,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,_)) @@ -725,28 +665,41 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); done; /* ugly macro end */ } + if(!just_preview) { /*-----------------------------------------------------------------*/ 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); } + iptables_save_line(iptablespreamble, FALSE); + + if(ip6prefix) + { + ip6tables_file = fopen(ip6tablesfile, "w"); + if(ip6tables_file == NULL) + { + perror(ip6tablesfile); + exit(-1); + } + iptables_save_line(iptablespreamble, TRUE); + iptables_save_line(ip6preamble, TRUE); + } + + run_iptables_restore(); - log_file=fopen(cmdlog,"w"); + log_file = fopen(cmdlog, "w"); if(log_file == NULL) { - puts("Cannot open logfile!"); + perror(cmdlog); exit(-1); - } - - save_line(iptablespreamble); - run_restore(); + } sprintf(str,"%s qdisc del dev %s root 2>/dev/null",tc,lan); safe_run(str); @@ -755,50 +708,72 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); safe_run(str); iptables_file=fopen(iptablesfile,"w"); - save_line(iptablespreamble); + iptables_save_line(iptablespreamble, FALSE); + if(ip6prefix) + { + ip6tables_file=fopen(ip6tablesfile,"w"); + iptables_save_line(iptablespreamble, TRUE); + iptables_save_line(ip6preamble, TRUE); + } - if(qos_free_zone && *qos_free_zone!='0') + if(qos_free_zone && *qos_free_zone!='0') /* this is currently supported only for IPv4 */ { char *chain; sprintf(str,"-A FORWARD -d %s -o %s -j ACCEPT", qos_free_zone, wan); - save_line(str); + iptables_save_line(str, FALSE); /* this is currently supported only for IPv4 */ +/* if(qos_proxy) { - save_line(":post_noproxy - [0:0]"); + iptables_save_line(":post_noproxy - [0:0]", FALSE); sprintf(str,"-A POSTROUTING ! -p tcp -o %s -j post_noproxy", lan); - save_line(str); + iptables_save_line(str , FALSE); sprintf(str,"-A POSTROUTING ! -s %s -o %s -j post_noproxy", proxy_ip, lan); - save_line(str); + iptables_save_line(str, FALSE); sprintf(str,"-A POSTROUTING -s %s -p tcp ! --sport %d -o %s -j post_noproxy", proxy_ip, proxy_port, lan); - save_line(str); + iptables_save_line(str, FALSE); chain="post_noproxy"; } + else { - chain="POSTROUTING"; - } +*/ + chain = "POSTROUTING"; +// } sprintf(str,"-A %s -s %s -o %s -j ACCEPT", chain, qos_free_zone, lan); - save_line(str); + iptables_save_line(str, FALSE); } - 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 */ + int idxcount=0, bitmask=32-idxtable_bitmask1; char *subnet, *buf; /*-----------------------------------------------------------------*/ printf("Detected %d addresses - indexing iptables rules to improve performance...\n",ip_count); /*-----------------------------------------------------------------*/ - save_line(":post_common - [0:0]"); - save_line(":forw_common - [0:0]"); + iptables_save_line(":post_common - [0:0]", FALSE); + iptables_save_line(":forw_common - [0:0]", FALSE); + if(ip6prefix) + { + iptables_save_line(":post_common - [0:0]", TRUE); + iptables_save_line(":forw_common - [0:0]", TRUE); + } - 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")) { - buf=index_id(ip->addr,bitmask); + if(ip->v6) + { + buf=index6_id(ip->addr,bitmask+32); + } + else + { + buf=index_id(ip->addr, bitmask); + } + if_exists(idx,idxs,eq(idx->id,buf)) { idx->children++; @@ -806,25 +781,33 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); else { create(idx,Index); - idx->addr=ip->addr; - idx->id=buf; - idx->bitmask=bitmask; - idx->parent=NULL; - idx->children=0; + idx->addr = ip->addr; + idx->id = buf; + idx->bitmask = bitmask+32*ip->v6; + idx->parent = NULL; + idx->children = 0; + idx->ipv6 = ip->v6; idxcount++; push(idx,idxs); } } /* 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=index_id(idx->addr,bitmask); + if(idx->ipv6) + { + buf = index6_id(idx->addr, bitmask+32); + } + else + { + buf = index_id(idx->addr, bitmask); + } if_exists(metaindex,idxs,eq(metaindex->id,buf)) { metaindex->children++; @@ -832,11 +815,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); else { create(metaindex,Index); - metaindex->addr=idx->addr; - metaindex->id=buf; - metaindex->bitmask=bitmask; - metaindex->parent=NULL; - metaindex->children=0; + metaindex->addr = idx->addr; + metaindex->id = buf; + metaindex->bitmask = bitmask+32*idx->ipv6; + metaindex->parent = NULL; + metaindex->children = 0; + metaindex->ipv6 = idx->ipv6; idxcount++; push(metaindex,idxs); } @@ -844,27 +828,33 @@ 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); i=0; for_each(idx,idxs) { - subnet=subnet_id(idx->addr,idx->bitmask); - printf("%d: %s/%d\n", - ++i, subnet, idx->bitmask); + if(idx->ipv6) + { + subnet=subnet6_id(idx->addr, idx->bitmask); + } + else + { + subnet=subnet_id(idx->addr, idx->bitmask); + } + printf("%d: %s/%d\n", ++i, subnet, idx->bitmask); sprintf(str,":post_%s - [0:0]", idx->id); - save_line(str); + iptables_save_line(str, idx->ipv6); sprintf(str,":forw_%s - [0:0]", idx->id); - save_line(str); + iptables_save_line(str, idx->ipv6); if(idx->parent) { string(buf,strlen(idx->parent->id)+6); - sprintf(buf,"post_%s",idx->parent->id); + sprintf(buf,"post_%s", idx->parent->id); } else { @@ -872,10 +862,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } sprintf(str,"-A %s -d %s/%d -o %s -j post_%s", buf, subnet, idx->bitmask, lan, idx->id); - save_line(str); + iptables_save_line(str, idx->ipv6); sprintf(str,"-A %s -d %s/%d -o %s -j post_common", buf, subnet, idx->bitmask, lan); - save_line(str); + iptables_save_line(str, idx->ipv6); if(idx->parent) { @@ -888,20 +878,28 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } sprintf(str,"-A %s -s %s/%d -o %s -j forw_%s", buf, subnet, idx->bitmask, wan, idx->id); - save_line(str); + iptables_save_line(str, idx->ipv6); sprintf(str,"-A %s -s %s/%d -o %s -j forw_common", buf, subnet, idx->bitmask, wan); - save_line(str); + iptables_save_line(str, idx->ipv6); } printf("Total indexed iptables chains created: %d\n", i); sprintf(str,"-A FORWARD -o %s -j forw_common", wan); - save_line(str); + iptables_save_line(str, FALSE); sprintf(str,"-A POSTROUTING -o %s -j post_common", lan); - save_line(str); + iptables_save_line(str, FALSE); + + if(ip6prefix) + { + sprintf(str,"-A FORWARD -o %s -j forw_common", wan); + iptables_save_line(str, TRUE); + + sprintf(str,"-A POSTROUTING -o %s -j post_common", lan); + iptables_save_line(str, TRUE); + } } - } if(just_flush) @@ -998,13 +996,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; @@ -1017,8 +1016,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); { if( ip->keyword->data_prio && !ip->fixedprio - && ( ip->traffic>ip->credit - + (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20))) ) + && ( ip->traffic > ip->credit + (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20))) ) { ip->prio=priority_sequence--; if(ip->prioaddr,_)) { 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); @@ -1085,6 +1095,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 */ } @@ -1098,394 +1109,29 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); printf("Writing json traffic overview %s ... ", json_traffic); /*-----------------------------------------------------------------*/ write_json_traffic(json_traffic); - } - - f=fopen(html,"w"); - if(f > 0) - { - int count=1; - i=0; /*-----------------------------------------------------------------*/ - printf("Sorting data and generating statistics page %s ...\n", html); + printf("Writing statistics into HTML 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_htmlandlogs(html, d, total, just_preview); } - i=0; - if(f > 0) + if(just_preview) { - 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 swchar='p'; + if(start_shaping) { - 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); - } - } + swchar='s'; } - fprintf(f,"\n\ -", colspan-7, i); - fprintf(f,"\n", total_traffic, total_direct); - if(qos_proxy) + else if(reduce_ceil) { - fprintf(f,"\n", total_proxy); + swchar='0'+reduce_ceil; /* -2, -4 */ } - 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) + else if(stop_shaping) { - 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); - } - } + swchar='q'; } - fprintf(f, stats_html_signature, version); - fclose(f); - } - - if(just_preview) - { - char swchar='p'; - if(start_shaping) - { - swchar='s'; - } printf("Statistics preview generated (-%c switch) - now exiting ...\n", swchar); exit(0); } @@ -1495,7 +1141,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) { @@ -1503,16 +1149,23 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } /*-----------------------------------------------------------------*/ - puts("Generating iptables and tc classes ... "); + printf(" + generating iptables and tc classes ... "); /*-----------------------------------------------------------------*/ - for_each(ip, ips) if(ip->mark > 0) + for_each(ip, ips) if(ip->mark > 0) /* works only for IPv4 so far */ { if(idxs) { char *buf; duplicate(ip->addr,buf); - buf=index_id(ip->addr,32-idxtable_bitmask1); + if(ip->v6) + { + buf=index6_id(ip->addr,64-idxtable_bitmask1); + } + else + { + buf=index_id(ip->addr,32-idxtable_bitmask1); + } string(chain_forward,6+strlen(buf)); strcpy(chain_forward,"forw_"); @@ -1530,39 +1183,67 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); chain_postrouting="POSTROUTING"; } + /* packet limits - this will be optional in future */ + if(ip->pps_limit) + { + sprintf(limit_pkts, "-m limit --limit %d/s --limit-burst %d ", + ip->pps_limit, ip->pps_limit); + } + else + { + *limit_pkts = 0; + } + #ifdef DEBUG - printf("%-22s %-16s %04d ", ip->name, ip->addr, ip->mark); + printf("%-22s %-16s %04d %d/s\n", ip->name, ip->addr, ip->mark, ip->pps_limit); #endif - /* -------------------------------------------------------- mark download */ - - sprintf(str, "-A %s -d %s/32 -o %s -j %s%d", - chain_postrouting, ip->addr, lan, mark_iptables, ip->mark); - /*sprintf(str,"-A %s -d %s/32 -o %s -j MARK --set-mark %d",chain_postrouting,ip->addr,lan,ip->mark);*/ - /* -m limit --limit 1/s */ - save_line(str); + /* -------------------------------------------------------- mark download */ + sprintf(str, "-A %s -d %s/%d -o %s -j %s%d", + chain_postrouting, ip->addr, ip->mask, + lan, mark_iptables, ip->mark); + iptables_save_line(str, ip->v6); +/* if(qos_proxy) { - sprintf(str, "-A %s -s %s -p tcp --sport %d -d %s/32 -o %s -j %s%d", - chain_postrouting, proxy_ip, proxy_port, ip->addr, lan, mark_iptables, ip->mark); - /*sprintf(str,"-A %s -s %s -p tcp --sport %d -d %s/32 -o %s -j MARK --set-mark %d",chain_postrouting,proxy_ip,proxy_port,ip->addr,lan,ip->mark);*/ - save_line(str); + sprintf(str, "-A %s -s %s -p tcp --sport %d -d %s/%d -o %s -j %s%d", + chain_postrouting, proxy_ip, proxy_port, ip->addr, + ip->mask, lan, mark_iptables, ip->mark); + iptables_save_line(str, ip->v6); } +*/ + sprintf(str, "-A %s -d %s/%d -o %s %s-j ACCEPT", + chain_postrouting, ip->addr, ip->mask, lan, limit_pkts); + iptables_save_line(str, ip->v6); + + /* classify overlimit packets to separate overlimit class */ + sprintf(str, "-A %s -d %s/%d -o %s -j %s%d", + chain_postrouting, ip->addr, ip->mask, + lan, mark_iptables, OVERLIMIT_CLASS); + iptables_save_line(str, ip->v6); - sprintf(str, "-A %s -d %s/32 -o %s -j ACCEPT", - chain_postrouting, ip->addr, lan); - save_line(str); + sprintf(str, "-A %s -d %s/%d -o %s -j ACCEPT", + chain_postrouting, ip->addr, ip->mask, lan); + iptables_save_line(str, ip->v6); /* -------------------------------------------------------- mark upload */ - sprintf(str, "-A %s -s %s/32 -o %s -j %s%d", - chain_forward, ip->addr, wan, mark_iptables, ip->mark); - /* sprintf(str,"-A %s -s %s/32 -o %s -j MARK --set-mark %d",chain_forward,ip->addr,wan,ip->mark);*/ - save_line(str); + sprintf(str, "-A %s -s %s/%d -o %s -j %s%d", + chain_forward, ip->addr, ip->mask, wan, mark_iptables, ip->mark); + iptables_save_line(str, ip->v6); + + sprintf(str, "-A %s -s %s/%d -o %s %s-j ACCEPT", + chain_forward, ip->addr, ip->mask, wan, limit_pkts); + iptables_save_line(str, ip->v6); + + /* classify overlimit packets to separate overlimit class */ + sprintf(str, "-A %s -s %s/%d -o %s -j %s%d", + chain_forward, ip->addr, ip->mask, wan, mark_iptables, OVERLIMIT_CLASS); + iptables_save_line(str, ip->v6); - sprintf(str, "-A %s -s %s/32 -o %s -j ACCEPT", - chain_forward, ip->addr, wan); - save_line(str); + sprintf(str, "-A %s -s %s/%d -o %s -j ACCEPT", + chain_forward, ip->addr, ip->mask, wan); + iptables_save_line(str, ip->v6); if(ip->min) { @@ -1572,21 +1253,21 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); #endif sprintf(str, "%s class add 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); + tc, lan, ip->group, ip->mark, ip->min, ip->max, burst, ip->prio); safe_run(str); if(strcmpi(ip->keyword->leaf_discipline, "none")) { - sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s", - tc, lan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/ - safe_run(str); + sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s", + tc, lan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/ + safe_run(str); } if(filter_type == 1) { - sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", - tc, lan, ip->mark, ip->mark); - safe_run(str); + sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", + tc, lan, ip->mark, ip->mark); + safe_run(str); } /* -------------------------------------------------------- upload class */ @@ -1603,21 +1284,21 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); if(strcmpi(ip->keyword->leaf_discipline, "none")) { - sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s", - tc, wan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/ - safe_run(str); + sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s", + tc, wan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/ + safe_run(str); } if(filter_type == 1) { - sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", - tc, wan, ip->mark, ip->mark); - safe_run(str); + sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", + tc, wan, ip->mark, ip->mark); + safe_run(str); } if(f > 0) { - fprintf(f, "%s %d\n", ip->addr, ip->mark); + fprintf(f, "%s %d\n", ip->addr, ip->mark); } } else @@ -1636,79 +1317,103 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); if(idxs) { - chain_forward = "forw_common"; - chain_postrouting = "post_common"; + chain_forward = "forw_common"; + chain_postrouting = "post_common"; } else { - chain_forward = "FORWARD"; - chain_postrouting = "POSTROUTING"; + chain_forward = "FORWARD"; + chain_postrouting = "POSTROUTING"; } - /* -------------------------------- classify or reject free download */ + + if(free_min) { - char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */ - if(free_min) - { - final_chain = "ACCEPT"; - } - if(qos_proxy) - { - if(free_min) - { - sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s%d", - chain_postrouting,proxy_ip,proxy_port,lan,mark_iptables,3); - save_line(str); - } - sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s", - chain_postrouting,proxy_ip,proxy_port,lan,final_chain); - save_line(str); - } - if(free_min) - { - sprintf(str,"-A %s -o %s -j %s%d", chain_postrouting, lan, mark_iptables, 3); - save_line(str); - } - sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain); - save_line(str); - /* ------------------------------- classify or reject free upload */ - if(free_min) - { - sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, 3); - save_line(str); - } - sprintf(str,"-A %s -o %s -j %s", chain_forward, wan, final_chain); - save_line(str); + final_chain = "ACCEPT"; + } + +/* + if(qos_proxy) + { + if(free_min) + { + sprintf(str, "-A %s -s %s -p tcp --sport %d -o %s -j %s%d", + chain_postrouting,proxy_ip,proxy_port,lan,mark_iptables, 3); + iptables_save_line(str, FALSE); // only for IPv4 + } + sprintf(str, "-A %s -s %s -p tcp --sport %d -o %s -j %s", + chain_postrouting,proxy_ip,proxy_port,lan,final_chain); + iptables_save_line(str, FALSE); // only for IPv4 + } +*/ + + if(free_min) + { + sprintf(str, "-A %s -o %s -j %s%d", + chain_postrouting, lan, mark_iptables, FREE_CLASS); + iptables_save_line(str, FALSE); /* only for IPv4 */ + } + + sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain); + iptables_save_line(str, FALSE); + if(ip6prefix) + { + sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain); + iptables_save_line(str, TRUE); + } + + if(free_min) + { + sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, FREE_CLASS); + iptables_save_line(str, FALSE); /* only for IPv4 */ + } + + sprintf(str,"-A %s -o %s -j %s", chain_forward, wan, final_chain); + iptables_save_line(str, FALSE); + if(ip6prefix) + { + sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain); + iptables_save_line(str, TRUE); } if(free_min) /* allocate free bandwith if it is not zero... */ { /*-----------------------------------------------------------------*/ - puts("Generating free bandwith classes ..."); + puts("Generating free bandwith class ..."); /*-----------------------------------------------------------------*/ - 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); + 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, FREE_CLASS, 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 %d", - tc, wan, parent, free_min, free_max, burst, lowest_priority); + 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, FREE_CLASS, free_min, free_max, burst, lowest_priority); safe_run(str); /* tc SFQ */ if(strcmpi(qos_leaf, "none")) { - sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s", tc, lan, qos_leaf); + sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, lan, FREE_CLASS, FREE_CLASS, qos_leaf); safe_run(str); - sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s", tc, wan, qos_leaf); + sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, wan, FREE_CLASS, FREE_CLASS, qos_leaf); safe_run(str); } /* tc handle 1 fw flowid */ - sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3", tc, lan); + sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, lan, FREE_CLASS, FREE_CLASS); safe_run(str); - sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3", tc, wan); + sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, wan, FREE_CLASS, FREE_CLASS); + safe_run(str); + + /*-----------------------------------------------------------------*/ + 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, 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, overlimit_min, overlimit_max, burst, lowest_priority); safe_run(str); } printf("Total IP count: %d\n", i); - run_restore(); + run_iptables_restore(); if(log_file) { fclose(log_file);