X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=07980f637bfbd4a3762065dc7e3b812b974678f6;hp=ce8e8040c0e1a24489154e6f12ac3c7b1f2f89b9;hb=1c9cae56507516acf3eda8fcfe60a74bfe923ee4;hpb=b17a255ff81c823eb399f66001df8d4a8f9f23d3 diff --git a/prometheus.c b/prometheus.c index ce8e804..07980f6 100644 --- a/prometheus.c +++ b/prometheus.c @@ -2,14 +2,14 @@ /* 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-2008 Michael Polak (xChaos) */ +/* 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, 20080728 +/* Modified by: xChaos, 20121007 ludva, 20080415 - + Prometheus QoS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2.1 of @@ -26,65 +26,92 @@ GNU General Public License is located in file COPYING */ -#define STRLEN 256 -#define FIRSTGROUPID 1024 -#define FIRSTIPCLASS 2048 +#define STRLEN 512 #undef DEBUG -#include "cll1-0.6.h" +#include "cll1-0.6.2.h" +#include "ipstruct.h" -const char *version = "0.8.1-a"; +const char *version = "0.8.3-g"; -/* Version numbers: 0.7.9 is development releases ("beta"), 0.8.0 will be "stable" */ +/* Version numbers: 0.8.3 is development releases ("beta"), 0.8.4 will be "stable" */ /* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */ /* C source code development versions ("beta"): 0.7.9-a, 0.8.1-b, etc. */ /* C source code release versions: 0.8.0, 0.8.2, 0.8.4, etc. */ -const char *stats_html_signature = "Statistics generated by Prometheus QoS version %s
GPL+Copyright(C)2005-2008 Michael Polak, Arachne Labs\n"; +const char *stats_html_signature = "Statistics generated by Prometheus QoS version %s
GPL+Copyright(C)2005-2012 Michael Polak, Arachne Labs\n"; /* ======= All path names are defined here (for RPM patch) ======= */ -char *tc = "/sbin/tc"; /* requires tc with HTB support */ -char *iptables = "/sbin/iptables"; /* requires iptables utility */ -char *iptablessave = "/sbin/iptables-save"; /* not yet required */ -char *iptablesrestore = "/sbin/iptables-restore"; /* requires iptables-restore */ -char *ls = "/bin/ls"; /* this is not user configurable :-) */ +const char *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 :-) */ 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 *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */ -char *html = "/var/www/traffic.html"; /* hall of fame filename */ -char *preview = "/var/www/preview.html"; /* hall of fame preview */ +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_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 */ -char *log_url = "logs/"; /* log directory relative URI prefix (partial URL) */ +char *log_url = "/logs/"; /* log directory relative URI prefix (partial URL) */ 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 row_odd_even = 0; /* */ + + +void parse_ip_log(int argc, char **argv); +/* implementid in parselog.c */ + +void parse_hosts(char *hosts); +/* implementid in parsehosts.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\ --?, --help this help screen\n\ --v, --version show version number of this utility and exit\n\ --c filename force alternative /etc/prometheus.conf filename\n\ --h filename force alternative /etc/hosts filename (overrides hosts keyword)\n\ --f just flush iptables and tc classes and exit (stop shaping)\n\ --9 emergency iptables flush (do not read data transfer statistics)\n\ --p just generate preview of data transfer statistics and exit\n\ --n no delay (overrides qos-free-delay keyword)\n\ --d dry run (preview tc and iptables commands on stdout)\n\ --l Mmm YYYY generate HTML summary of traffic logs (Mmm=Jan-Dec or Year, YYYY=year)\n\ --m generate HTML summary of traffic logs for yesterday's month\n\ --y generate HTML summary of traffic logs for yesterday's year\n"); -/* not yet implemented: --s start shaping! (keep data transfer statistics - but apply shaping)\n\ --r just reload configuration (...and keep data transfer statistics)\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*/ @@ -104,6 +131,7 @@ 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 */ @@ -114,13 +142,14 @@ int free_max = 64; /* maximum allowed bandwidth for all undefined host int qos_free_delay = 0; /* seconds to sleep before applying new QoS rules */ int digital_divide = 2; /* controls digital divide weirdness ratio, 1...3 */ int max_nesting = 3; /* maximum nesting of HTB clases, built-in maximum seems to be 4 */ -int htb_r2q = 1; +int htb_r2q = 256; /* should work for leaf values 512 kbps to 8 Mbps */ int burst = 8; /* HTB burst (in kbits) */ int burst_main = 64; int burst_group = 32; -int magic_priorities = 8; /* number of priority levels (soft shaping) */ int magic_treshold = 8; /* reduce ceil by X*magic_treshhold kbps (hard shaping) */ int keywordcount = 0; +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 !!! @@ -128,44 +157,18 @@ int packet_limit = 5; maximum number of pps to htn CEIL, not rate !!! FILE *log_file = NULL; char *kwd = "via-prometheus"; /* /etc/hosts comment, eg. #qos-64-128 */ -const int idxtable_treshold1=24; /* this is no longer configurable */ -const int idxtable_treshold2=12; /* this is no longer configurable */ -const int idxtable_bitmask1=3; /* this is no longer configurable */ -const int idxtable_bitmask2=3; /* this is no longer configurable */ +const int highest_priority = 0; /* highest HTB priority (HTB built-in value is 0) */ +const int lowest_priority = 7; /* lowest HTB priority (HTB built-in value is 7) */ +const int idxtable_treshold1 = 24; /* this is no longer configurable */ +const int idxtable_treshold2 = 12; /* this is no longer configurable */ +const int idxtable_bitmask1 = 3; /* this is no longer configurable */ +const int idxtable_bitmask2 = 3; /* this is no longer configurable */ -/* ==== This is C<<1 stuff - learn C<<1 first! http://cll1.arachne.cz ==== */ +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; - 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 -{ - int min; - int count; - int desired; - int id; - list(Group); -} *groups=NULL, *group; +/* ==== This is C<<1 stuff - learn C<<1 first! https://dev.arachne.cz/svn/cll1h ==== */ struct Index { @@ -177,42 +180,30 @@ 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=1; - ip->fixedprio=0; - ip->mark=ip->min=ip->max=ip->desired=ip->credit=0; - ip->upload=ip->proxy=ip->direct=ip->traffic=0; - ip->pktsup=ip->pktsdown=0; - ip->keyword=keywords; + 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); } @@ -221,17 +212,21 @@ void TheIP(void) 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; + int dot=0, n; char *ip,*outip,*outptr,*fmt; duplicate(inip,ip); /* debug printf("(%s,%d) -> ",ip,bitmask); */ 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) { @@ -240,31 +235,51 @@ char *very_ugly_ipv4_code(char *inip,int bitmask,int format_as_chainname) 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'; + char *cutdot=strchr(ip+1,'.'); /*for bitmask<24*/ + if(cutdot) + { + *cutdot = '\0'; + } + if(format_as_chainname) - fmt="_%d_%d"; + { + fmt = "_%d_%d"; + } else - fmt=".%d"; + { + fmt = ".%d"; + } + if(bitmask%8) - n=atoi(ip+1)-atoi(ip+1)%(1<<(8-bitmask%8)); + { + n = atoi(ip+1)-atoi(ip+1)%(1<<(8-bitmask%8)); + } else - n=0; + { + 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) + if(!format_as_chainname) { - strcat(outip,".0"); - bitmask+=8; + while(bitmask<24) + { + strcat(outip,".0"); + bitmask+=8; + } } /* debug printf("[%s]\n",outip); */ return outip; @@ -283,10 +298,14 @@ char *very_ugly_ipv4_code(char *inip,int bitmask,int format_as_chainname) } char *hash_id(char *ip,int bitmask) -{ return very_ugly_ipv4_code(ip,bitmask,1); } +{ + return very_ugly_ipv4_code(ip,bitmask,1); +} char *subnet_id(char *ip,int bitmask) -{ return very_ugly_ipv4_code(ip,bitmask,0); } +{ + return very_ugly_ipv4_code(ip,bitmask,0); +} /* ================= Let's parse configuration file here =================== */ @@ -313,16 +332,12 @@ void get_config(char *config_filename) keyword->asymetry_ratio=1; /* ratio for ADSL-like upload */ keyword->asymetry_fixed=0; /* fixed treshold for ADSL-like upload */ keyword->data_limit=8; /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */ - keyword->data_prio=4; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */ + keyword->data_prio=4; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */ keyword->fixed_limit=0; /* fixed data limit for setting lower HTB ceil */ keyword->fixed_prio=0; /* fixed data limit for setting lower HTB prio */ keyword->reserve_min=8; /* bonus for nominal HTB rate bandwidth (in kbps) */ keyword->reserve_max=0; /* malus for nominal HTB ceil (in kbps) */ -/* obsolete: - keyword->divide_max=0; relative malus: new_ceil=rate+(old_ceil-rate)/divide_max - keyword->htb_ceil_bonus_divide=0; relative bonus: new_ceil=old_ceil+old_ceil/htb_ceil_bonus_divide -*/ - keyword->default_prio=1; + keyword->default_prio=highest_priority+1; keyword->html_color="000000"; keyword->ip_count=0; keyword->leaf_discipline=""; @@ -333,43 +348,43 @@ void get_config(char *config_filename) kwd=NULL; } - else every(keyword,keywords) + else { - int l=strlen(keyword->key); - + for_each(keyword,keywords) + { + int l=strlen(keyword->key); - if(!strncmp(keyword->key,_,l) && strlen(_)>l+2) - { - char *tmptr=_; /* <---- l+1 ----> */ - _+=l+1; /* via-prometheus-asymetry-ratio, etc. */ - ioption("asymetry-ratio",keyword->asymetry_ratio); - ioption("asymetry-treshold",keyword->asymetry_fixed); - ioption("magic-relative-limit",keyword->data_limit); - ioption("magic-relative-prio",keyword->data_prio); - loption("magic-fixed-limit",keyword->fixed_limit); - loption("magic-fixed-prio",keyword->fixed_prio); - ioption("htb-default-prio",keyword->default_prio); - ioption("htb-rate-bonus",keyword->reserve_min); - ioption("htb-ceil-malus",keyword->reserve_max); -/* obsolete: - ioption("htb-ceil-divide",keyword->divide_max); - ioption("htb-ceil-bonus-divide",keyword->htb_ceil_bonus_divide); -*/ - option("leaf-discipline",keyword->leaf_discipline); - option("html-color",keyword->html_color); - _=tmptr; - - if(keyword->data_limit || keyword->fixed_limit || - keyword->data_prio || keyword->fixed_prio) - use_credit=1; - } + if(!strncmp(keyword->key,_,l) && strlen(_)>l+2) + { + char *tmptr=_; /* <---- l+1 ----> */ + _+=l+1; /* via-prometheus-asymetry-ratio, etc. */ + ioption("asymetry-ratio",keyword->asymetry_ratio); + ioption("asymetry-treshold",keyword->asymetry_fixed); + ioption("magic-relative-limit",keyword->data_limit); + ioption("magic-relative-prio",keyword->data_prio); + loption("magic-fixed-limit",keyword->fixed_limit); + loption("magic-fixed-prio",keyword->fixed_prio); + ioption("htb-default-prio",keyword->default_prio); + ioption("htb-rate-bonus",keyword->reserve_min); + ioption("htb-ceil-malus",keyword->reserve_max); + option("leaf-discipline",keyword->leaf_discipline); + option("html-color",keyword->html_color); + _=tmptr; + + if(keyword->data_limit || keyword->fixed_limit || + keyword->data_prio || keyword->fixed_prio) + { + use_credit=1; + } + } + } } option("tc",tc); option("iptables",iptables); option("iptables-save",iptablessave); /* new */ option("iptables-restore",iptablesrestore); /* new */ - option("iptables-file",iptablesfile); /* new */ + option("iptables-in-filename",iptablesfile); /* new */ option("hosts",hosts); option("lan-interface",lan); option("wan-interface",wan); @@ -380,13 +395,19 @@ 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("hall-of-fame-preview",preview); + option("json-preview",json_preview); option("log-filename",cmdlog); option("credit-filename",credit); + option("classmap-filename",classmap); ioption("credit-enable",enable_credit); option("log-traffic-directory",log_dir); option("log-traffic-html-directory",html_log_dir); option("log-traffic-url-path",log_url); + option("jquery-url",jquery_url); + option("lms-url",lms_url); + 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); @@ -401,10 +422,8 @@ void get_config(char *config_filename) ioption("htb-nesting-limit",max_nesting); ioption("htb-r2q",htb_r2q); ioption("magic-include-upload",include_upload); - ioption("magic-priorities",magic_priorities); ioption("magic-treshold",magic_treshold); - option("filter-type", cnf); - + option("filter-type", cnf); /* not yet implemented: ioption("magic-fixed-packets",fixed_packets); ioption("magic-relative-packets",packet_limit); @@ -415,25 +434,29 @@ void get_config(char *config_filename) perror(config_filename); puts("Warning - using built-in defaults instead ..."); } - done; + done; /* ugly macro end */ printf("\n"); - /*leaf discipline for keywords*/ - every(keyword,keywords) + /* leaf discipline for keywords */ + for_each(keyword,keywords) { - if (!strcmpi(keyword->leaf_discipline, "")){ + if(!strcmpi(keyword->leaf_discipline, "")) + { keyword->leaf_discipline = qos_leaf; } } - if (strcmpi(cnf, "mark")){ - filter_type = 2; - mark = "CLASSIFY"; - mark_iptables = "CLASSIFY --set-class 1:"; - }else{ - filter_type = 1; - mark = "MARK"; - mark_iptables = "MARK --set-mark "; + if(strcmpi(cnf, "mark")) + { + filter_type = 2; + mark = "CLASSIFY"; + mark_iptables = "CLASSIFY --set-class 1:"; + } + else + { + filter_type = 1; + mark = "MARK"; + mark_iptables = "MARK --set-mark "; } /* are supplied values meaningful ?*/ @@ -465,7 +488,7 @@ void get_traffic_statistics(void) append(line,lines); } - every(line,lines) + for_each(line,lines) { int col, accept=0,proxyflag=0,valid=1,setchainname=0,commonflag=0; unsigned long long traffic=0; @@ -477,46 +500,77 @@ void get_traffic_statistics(void) 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; + { + downloadflag = 1; + } else - if(!strncmp(ptr,"forw_",5) || eq(ptr,"FORWARD")) - downloadflag=0; - + { + if(!strncmp(ptr,"forw_",5) || eq(ptr,"FORWARD")) + { + downloadflag = 0; + } + } if(eq(ptr,"post_common") || eq(ptr,"forw_common")) - commonflag=1; + { + commonflag = 1; + } } else - sscanf(ptr,"%Lu",&traffic); traffic+=(1<<19); traffic>>=20; + { + 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");*/ + } + /*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; + if(strstr(proxy_ip,ptr)) + { + proxyflag=1; + } } else + { ipaddr=ptr; - break; + } + 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 M (%ld pkts)\n", ipaddr, traffic, pkts); - find(ip,ips,eq(ip->addr,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(); @@ -532,9 +586,13 @@ void get_traffic_statistics(void) if(downloadflag) { if(proxyflag) + { ip->proxy=traffic; + } else + { ip->traffic+=traffic; + } ip->direct=ip->traffic-ip->upload-ip->proxy; ip->pktsdown=pkts; } @@ -543,23 +601,38 @@ void get_traffic_statistics(void) ip->upload=traffic; ip->pktsup=pkts; if(include_upload) + { ip->traffic+=traffic; + } else + { if(traffic>ip->traffic) + { ip->traffic=traffic; + } + } } } } - - free(cmd); + free(cmd); } /* ========== This function executes, logs OR ALSO prints command ========== */ void safe_run(char *cmd) { - if(dry_run) printf("\n=>%s\n",cmd); else system(cmd); - if(log_file) fprintf(log_file,"%s\n",cmd); + if(dry_run) + { + printf("\n=>%s\n",cmd); + } + else + { + system(cmd); + } + if(log_file) + { + fprintf(log_file,"%s\n",cmd); + } } void save_line(char *line) @@ -569,22 +642,22 @@ void save_line(char *line) void run_restore(void) { - char *restor, *str; + char *restor; string(restor,STRLEN); /*-----------------------------------------------------------------*/ - printf("Running %s <%s ...\n",iptablesrestore,iptablesfile); + printf("Running %s <%s ...\n", iptablesrestore, iptablesfile); /*-----------------------------------------------------------------*/ save_line("COMMIT"); fclose(iptables_file); if(dry_run) { - parse(iptablesfile) - { - str=_; - printf("%s\n", str); - }done; + parse(iptablesfile) + { + printf("%s\n",_); + } + done; /* ugly macro end */ } sprintf(restor,"%s <%s",iptablesrestore, iptablesfile); @@ -593,30 +666,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=str,*ipaddr=NULL,*ipname=NULL;; - - 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; - - find(ip,ips,eq(ip->addr,ipaddr)); else TheIP(); - ip->addr=ipaddr; - ip->name=ipname; -} - char *parse_datafile_line(char *str) { char *ptr=strchr(str,' '); @@ -628,190 +677,89 @@ char *parse_datafile_line(char *str) return ptr; } else + { return NULL; + } } -struct IpLog -{ - char *name; - long traffic; - long guaranted; - list(IpLog); -} *iplog,*iplogs; - -void parse_ip_log(int argc, char **argv) +void append_log(struct IP *self) /*using global variables*/ { - char *month, *year, *str, *name, *ptr, *ptr2; - long traffic, traffic_month, total=0, guaranted; - int col, col2, y_ok, m_ok, accept_month, i=1, any_month=0; - char mstr[4], ystr[5]; + char *d, *str; FILE *f; - string(str,STRLEN); - if(argv[1][1]=='l') /* -l */ + 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) { - if(argc<4) - { - puts("Missing parameter(s)!\nUsage: prometheus -l Mmm YYYY (Mmm=Jan-Dec or Year, YYYY=year)"); - exit(-1); - } - else - { - month=argv[2]; - if(eq(month,"Year")) any_month=1; - year=argv[3]; - } + 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 - { - time_t t = time(NULL) - 3600*24 ; /* yesterday's timestamp*/ - struct tm *timep = localtime(&t); - - if(argv[1][1]=='m') /* -m yestarday - month */ - { - strftime(mstr, 4, "%b", timep); - month=mstr; - strftime(ystr, 5, "%Y", timep); - year=ystr; - } - else /* -y yesterday - year */ - { - month="Year"; - any_month=1; - strftime(ystr, 5, "%Y", timep); - year=ystr; - } - } - printf("Analysing traffic for %s %s ...\n",month,year); - - sprintf(str,"%s %s/*.log",ls,log_dir); - shell(str); - - input(str,STRLEN) { - ptr=strrchr(str,'\n'); - if(ptr) *ptr='\0'; - printf("Parsing %s ...",str); - accept_month=0; - traffic_month=0; - guaranted = 0; - parse(str) - { - y_ok=m_ok=0; - valid_columns(ptr,_,'\t',col) switch(col) - { - case 2: name = ptr;break; - case 3: traffic = atol(ptr);break; - /* column number - was 7, now 10...*/ - case 7: - case 8: - case 9: - case 10: if (isalpha(*ptr)) /* character, not numeric string = date, just one*/ - { - valid_columns(ptr2,ptr,' ',col2) switch(col2) - { - case 2: if(any_month || eq(ptr2,month)) m_ok = 1; break; - case 5: if(eq(ptr2,year)) y_ok = 1; break; - } - } - else - { - if(col == 7) guaranted = atol(ptr); - } - } - - if(y_ok && m_ok) - { - traffic_month += traffic; - accept_month = 1; - } - } - done; - - if(accept_month) - { - create(iplog,IpLog); - iplog->name = name; - iplog->guaranted = guaranted; - iplog->traffic = traffic_month; - insert(iplog,iplogs,desc_order_by,traffic); - printf(" %ld MB\n",iplog->traffic); - } - else - puts(" no records."); - } - sprintf(str,"%s/%s-%s.html",html_log_dir,year,month); - printf("Writing %s ...",str); - f=fopen(str,"w"); - if(f) - { - fprintf(f,"\n ",month,year); - every(iplog,iplogs) - if(iplog->traffic) - { - fprintf(f,"\n", - i++, iplog->name, iplog->traffic, iplog->traffic>>10, iplog->guaranted); - total+=iplog->traffic>>10; - } - fprintf(f,"\n", total, line); - fputs("
%s %sData transfersMin.speed
%d%s%ld MB%ld GB%ld kbps
Total:%ld GB%Ld kbps
\n", f); - fprintf(f, stats_html_signature, version); - fclose(f); - puts(" done."); + perror(str); } } - /*-----------------------------------------------------------------*/ -/* Are you looking for int main (int argc, char **argv) ? :-)) */ +/* Are you looking for int main(int argc, char **argv) ? :-)) */ /*-----------------------------------------------------------------*/ program { - int i=0; - FILE *f=NULL; - char *str, *ptr, *d; + 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 class_count=0,ip_count=0; + int parent=1; - int just_flush=0; - int nodelay=0; - int just_preview=0; /* preview - generate just stats */ - int just_logs=0; /* just parse logs */ + int just_flush=FALSE; /* 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; printf("\n\ Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\ -Version %s - Copyright (C)2005-2008 Michael Polak (xChaos)\n\ +Version %s - Copyright (C)2005-2012 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); - /*----- Boring... we have to check command line options first: ----*/ - + /*----- Boring... we have to check command line options first: ----*/ arguments { argument("-c") { nextargument(config); } argument("-h") { nextargument(althosts);} - argument("-d") { dry_run=1; } - argument("-f") { just_flush=1; } - argument("-9") { just_flush=9; } - argument("-p") { just_preview=1; } - argument("-n") { nodelay=1; } - argument("-l") { just_logs=1; } - argument("-m") { just_logs=1; } - argument("-y") { just_logs=1; } + argument("-d") { run=TRUE; dry_run=TRUE; } + argument("-f") { run=TRUE; just_flush=TRUE; } + argument("-9") { run=TRUE; just_flush=9; } + argument("-p") { run=TRUE; just_preview=TRUE; } + argument("-s") { run=TRUE; just_preview=TRUE; start_shaping=TRUE; } + argument("-r") { run=TRUE; } + argument("-n") { run=TRUE; nodelay=TRUE; } + argument("-l") { just_logs=TRUE; } + argument("-m") { just_logs=TRUE; } + argument("-y") { just_logs=TRUE; } argument("-?") { help(); exit(0); } argument("--help") { help(); exit(0); } argument("-v") { exit(0); } argument("--version") { exit(0); } } - + if(dry_run) + { puts("*** THIS IS JUST DRY RUN ! ***\n"); + } - date(d); /* this is typical cll1.h macro */ + date(d); /* this is typical cll1.h macro - prints current date */ /*-----------------------------------------------------------------*/ printf("Parsing configuration file %s ...\n", config); @@ -820,11 +768,19 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); if(just_logs) { - parse_ip_log(argc,argv); - exit(0); + parse_ip_log(argc,argv); + exit(0); + } + else if(not run) + { + help(); + exit(0); } - if(althosts) hosts=althosts; + if(althosts) + { + hosts=althosts; + } if(just_flush<9) { @@ -837,104 +793,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /*-----------------------------------------------------------------*/ printf("Parsing class defintion file %s ...\n", hosts); /*-----------------------------------------------------------------*/ - int groupidx = FIRSTGROUPID; - parse(hosts) - { - str=_; - - if(*str<'0' || *str>'9') - 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 ? - - find(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 kbps\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->keyword->divide_max>1) - ip->max=ip->min+(ip->max-ip->min)/ip->keyword->divide_max; - if(ip->keyword->htb_ceil_bonus_divide>0) - ip->max+=ip->max/ip->keyword->htb_ceil_bonus_divide; -*/ - if(ip->maxmin) - ip->max=ip->min; - } - ip->mark=FIRSTIPCLASS+1+class_count++; - - find(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; + parse_hosts(hosts); /*-----------------------------------------------------------------*/ /* cll1.h - let's allocate brand new character buffer... */ @@ -944,17 +803,21 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /*-----------------------------------------------------------------*/ puts("Resolving shared connections ..."); /*-----------------------------------------------------------------*/ - search(ip,ips,ip->sharing) + for_each(ip,ips) if(ip->sharing) { - search(sharedip,ips,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; break; } - if(!sharedip) - printf("Unresolved shared connection: %s %s sharing-%s\n",ip->addr,ip->name,ip->sharing); + if(not sharedip) + { + printf("Unresolved shared connection: %s %s sharing-%s\n", + ip->addr, ip->name, ip->sharing); + } } if(enable_credit && just_flush<9) @@ -967,11 +830,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); ptr=parse_datafile_line(_); if(ptr) { - find(ip,ips,eq(ip->addr,_)) + if_exists(ip,ips,eq(ip->addr,_)) + { sscanf(ptr,"%Lu",&(ip->credit)); + } } } - done; + done; /* ugly macro end */ } if(!just_preview) @@ -981,13 +846,15 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /*-----------------------------------------------------------------*/ iptables_file=fopen(iptablesfile,"w"); - if (iptables_file == NULL) { + if(iptables_file == NULL) + { puts("Cannot open iptablesfile!"); exit(-1); } log_file=fopen(cmdlog,"w"); - if (log_file == NULL) { + if(log_file == NULL) + { puts("Cannot open logfile!"); exit(-1); } @@ -1024,7 +891,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); chain="post_noproxy"; } else + { chain="POSTROUTING"; + } sprintf(str,"-A %s -s %s -o %s -j ACCEPT", chain, qos_free_zone, lan); save_line(str); @@ -1041,11 +910,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); save_line(":post_common - [0:0]"); save_line(":forw_common - [0:0]"); - search(ip,ips,ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0")) + for_each(ip,ips) if(ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0")) { buf=hash_id(ip->addr,bitmask); - find(idx,idxs,eq(idx->id,buf)) + if_exists(idx,idxs,eq(idx->id,buf)) + { idx->children++; + } else { create(idx,Index); @@ -1064,11 +935,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); { bitmask-=idxtable_bitmask2; idxcount=0; - search(idx,idxs,idx->parent==NULL) + + for_each(idx,idxs) if(idx->parent == NULL) { buf=hash_id(idx->addr,bitmask); - find(metaindex,idxs,eq(metaindex->id,buf)) - metaindex->children++; + if_exists(metaindex,idxs,eq(metaindex->id,buf)) + { + metaindex->children++; + } else { create(metaindex,Index); @@ -1089,10 +963,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); sort(idx,idxs,order_by,bitmask); i=0; - every(idx,idxs) + for_each(idx,idxs) { subnet=subnet_id(idx->addr,idx->bitmask); - printf("%d: %s/%d\n",++i,subnet,idx->bitmask); + printf("%d: %s/%d\n", + ++i, subnet, idx->bitmask); sprintf(str,":post_%s - [0:0]", idx->id); save_line(str); @@ -1106,7 +981,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); sprintf(buf,"post_%s",idx->parent->id); } else + { buf="POSTROUTING"; + } sprintf(str,"-A %s -d %s/%d -o %s -j post_%s", buf, subnet, idx->bitmask, lan, idx->id); save_line(str); @@ -1120,7 +997,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); sprintf(buf,"forw_%s",idx->parent->id); } else + { buf="FORWARD"; + } sprintf(str,"-A %s -s %s/%d -o %s -j forw_%s", buf, subnet, idx->bitmask, wan, idx->id); save_line(str); @@ -1142,7 +1021,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); if(just_flush) { fclose(iptables_file); - if (log_file) fclose(log_file); + if(log_file) + { + fclose(log_file); + } puts("Just flushed iptables and tc classes - now exiting ..."); exit(0); } @@ -1155,226 +1037,427 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); sleep(qos_free_delay); } - sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",tc,lan,htb_r2q); + sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1", + tc,lan,htb_r2q); safe_run(str); - sprintf(str,"%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio 0",tc,lan,lan_medium,lan_medium,burst_main); + sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d", + tc,lan,lan_medium,lan_medium,burst_main,highest_priority); safe_run(str); - sprintf(str,"%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio 0",tc,lan,line,line,burst_main); + sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d", + tc,lan,line,line,burst_main,highest_priority); safe_run(str); sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",tc,wan,htb_r2q); safe_run(str); - sprintf(str,"%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio 0",tc,wan,wan_medium,wan_medium,burst_main); + sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d", + tc,wan,wan_medium,wan_medium,burst_main,highest_priority); safe_run(str); - sprintf(str,"%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio 0",tc,wan,up,up,burst_main); + sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d", + tc,wan,up,up,burst_main,highest_priority); safe_run(str); } /*-----------------------------------------------------------------*/ - puts("Locating suckers and generating root classes ..."); + puts("Locating heavy downloaders and generating root classes ..."); /*-----------------------------------------------------------------*/ - sort(ip,ips,desc_order_by,traffic); - + sort(ip,ips,desc_order_by,traffic); /*-----------------------------------------------------------------*/ /* sub-scope - local variables */ { - long long int rate=line; - long long int max=line; - int group_count=0; - FILE *credit_file=NULL; + long long int rate = line; + long long int max = line; + int group_count = 0; + FILE *credit_file = NULL; - if(!just_preview && !dry_run && enable_credit) credit_file=fopen(credit,"w"); + if(!just_preview && !dry_run && enable_credit) + { + credit_file = fopen(credit,"w"); + } - every(group,groups) + for_each(group,groups) { if(!just_preview) { - //download - sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio 1 #down desired %d", - tc, lan, parent, group->id, rate, max, burst_group, group->desired); + sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d #down desired %d", + tc, lan, parent, group->id, rate, max, burst_group, highest_priority+1, group->desired); safe_run(str); //upload - sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio 1 #up desired %d", - tc, wan, parent, group->id, rate*up/line, max*up/line, burst_group, group->desired); + sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d #up desired %d", + tc, wan, parent, group->id, rate*up/line, max*up/line, burst_group, highest_priority+1, group->desired); safe_run(str); } - if(group_count++id; + if(group_count++ < max_nesting) + { + parent = group->id; + } - rate-=digital_divide*group->min; - if(ratemin)rate=group->min; + rate -= digital_divide*group->min; + if(rate < group->min) + { + rate = group->min; + } /*shaping of aggresive downloaders, with credit file support */ if(use_credit) { - int group_rate=group->min, priority_sequence=magic_priorities+1; + int group_rate = group->min, priority_sequence = lowest_priority; - search(ip, ips, ip->min==group->min && ip->max>ip->min) + for_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)) ) + if( ip->keyword->data_limit && !ip->fixedprio + && ( ip->traffic>ip->credit + + (ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))) ) { - if(group_ratemax) ip->max=group_rate; + if(group_ratemax) + { + ip->max=group_rate; + } group_rate+=magic_treshold; - ip->prio=magic_priorities+2; - if(ip->prio<3) ip->prio=3; + ip->prio=lowest_priority; + if(ip->prioprio=highest_priority+2; + } } else { - if( ip->keyword->data_prio && !ip->fixedprio && - ip->traffic>ip->credit+ - (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20)) ) + if( ip->keyword->data_prio + && !ip->fixedprio + && ( ip->traffic>ip->credit + + (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20))) ) { ip->prio=priority_sequence--; - if(ip->prio<2) ip->prio=2; + if(ip->prioprio=highest_priority+1; + } } if(credit_file) { unsigned long long lcredit=0; - if((ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))>ip->traffic) + if((ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))>ip->traffic) + { lcredit=(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))-ip->traffic; + } fprintf(credit_file,"%s %Lu\n",ip->addr,lcredit); } } - } - + } } } - if(credit_file)fclose(credit_file); + if(credit_file) + { + fclose(credit_file); + } } if(just_preview) { - f=fopen(preview,"w"); - ptr=preview; + if(start_shaping) + { + printf("Reading %s and applying Fair Use Policy rules ... \n", classmap); + parse(classmap) + { + ptr=strchr(_,' '); + if(ptr) + { + *ptr=0; + ptr++; + if_exists(ip,ips,eq(ip->addr,_)) + { + ip->mark=atoi(ptr); + if(ip->max < ip->desired) /* apply FUP limit immediately.... */ + { + printf("Applying limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark); + 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); + safe_run(str); + printf("up: %dk-%dk)\n", (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), + (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed)); + sprintf(str,"%s class change dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", + tc, wan, ip->group, ip->mark, + (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), + (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio); + safe_run(str); + } + } + } + } + fail + { + perror(classmap); + puts("Warning - classmap file not fund, just generating preview ..."); + start_shaping=FALSE; + } + done; /* ugly macro end */ + } + html=preview; + json=json_preview; } - else if(!dry_run && !just_flush) + + if(!dry_run && !just_flush) { /*-----------------------------------------------------------------*/ - printf("Writing data transfer database ...\n"); + printf("Writing json overview %s ... ", json); /*-----------------------------------------------------------------*/ - f=fopen("/var/run/prometheus.previous","w"); - if(f) + f=fopen(json, "w"); + if(f > 0) { - search(ip,ips,ip->traffic || ip->direct || ip->proxy ||ip->upload) - fprintf(f,"%s %Lu %Lu %Lu %Lu\n",ip->addr,ip->traffic,ip->direct,ip->proxy,ip->upload); + 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"); - ptr=html; } - if(f) + f=fopen(html,"w"); + if(f > 0) { - int total=0; int count=1; i=0; /*-----------------------------------------------------------------*/ - printf("Sorting data and generating statistics page %s ...\n",ptr); + printf("Sorting data and generating statistics page %s ...\n", html); /*-----------------------------------------------------------------*/ - fputs("\n\n",f); - fprintf(f,"\n",keywordcount); - fputs("\n",f); - every(group,groups) + if(use_jquery_popups) + { + fprintf(f,"\n", jquery_url); + } + fputs("
#groupIPsrequesteddata limits
\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 k group: %d bandwidth requested: %d k\n",group->min,group->count,group->desired); + printf("%d kb/s group: %d bandwidth requested: %d kb/s\n",group->min,group->count,group->desired); #endif - fprintf(f,"",count,group->min); - fprintf(f,"",group->count,group->desired); + fprintf(f, "%s", + tr_odd_even(), count, group->min); + fprintf(f, "", + group->count, group->desired); - every(keyword,keywords) - fprintf(f,"",keyword->html_color,group->min*keyword->data_limit); - - i+=group->desired; - total+=group->count; + 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 k\nAGGREGATION: 1/%d\n",count,i,i/line); + printf("Total groups: %d Total bandwidth requested: %d kb/s\nAGGREGATION: 1/%d\n", + count, i, i/line); #endif - fprintf(f,"",keyword->ip_count); + fprintf(f,"\n\ +\n\ +\n",(int)(0.5+i/line)); - fprintf(f,"\n",keywordcount,total); + for_each(keyword, keywords) if(keyword->ip_count) + { + fprintf(f,"",keyword->ip_count); + } + fprintf(f,"\n", (int)(0.5+i/line)); + fprintf(f,"\n", keywordcount, total); - fputs("
Bandwidth classes
#groupIPsrequesteddata limits
%d%d k%d%d k%d%d kb/s%d%d kb/s%d M%d MB
Line %Ld k",line); - fprintf(f,"%d%d k",total,i); - - every(keyword,keywords) - fprintf(f,"%d IPs
Line %Ld kb/s",line); + fprintf(f,"%d%d kb/s",total,i); - fprintf(f,"
Aggregation 1/%d%d traffic classes
%d IPs
Aggregation 1/%d%d traffic classes
\n",f); + fputs("\n",f); } - else if(!dry_run && !just_flush) + else if(!dry_run && !just_flush) + { perror(html); + } - i=1; - if(f) + i=0; + if(f > 0) { - unsigned long long total=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=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; - FILE *iplog; + 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=12; - else - colspan=11; + { + colspan++; + } - fprintf(f,"

\n\n", d); - fputs("\ - \ - \ - \ - \n",f); + fprintf(f,"

%s",colspan,title); - fprintf(f," (%s)
#hostnamecreditlimittotaldirect
\n\n", d); + fputs("\n\n",f); + fputs("\n\ +\n\ +\n\ +\n",f); if(qos_proxy) - fputs("\n",f); - fputs("\ - \ - \ - \ - \n",f); - - every(ip,ips) + { + 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=""; - if(ip->maxdesired) + 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) { - f1=""; - f2=""; + fputs("\n",f); } - else if(ip->prio>1) + 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); + /* ----------------------------------------------- */ -#ifdef DEBUG - printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); -#endif - fprintf(f,"\n", - ip->name, i, log_url, ip->name, ip->name, ip->credit); - fprintf(f,"",ip->keyword->html_color,ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))); - fprintf(f,"\n", f1, ip->traffic, f2, ip->direct); if(qos_proxy) - fprintf(f,"\n", ip->proxy); - fprintf(f,"\n", ip->upload); - fprintf(f,"\n",ip->min,ip->desired,f1,ip->max,f2,f1,ip->prio,f2); - total+=ip->traffic; + { + 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; @@ -1387,107 +1470,184 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); sum->i=active_classes; insert(sum,sums,order_by,i); } - - i++; - + if(!just_preview) { - sprintf(str,"%s/%s.log",log_dir,ip->name); - iplog=fopen(str,"a"); - if(iplog) + append_log(ip); + for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing)) { - fprintf(iplog,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%s", - time(NULL),ip->name,ip->traffic,ip->direct,ip->proxy,ip->upload,ip->min,ip->max,ip->desired,d); /* d = date*/ - fclose(iplog); + append_log(sharedip); } } - } - fprintf(f,"\ - \n", total, total_direct); + 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); - fputs("\n
%s",title); + fprintf(f," (%s)
 creditFUPtotaldownproxyuploadminimumdesiredmaximumprio
proxyupminmaxlimit 
#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) { - f1=""; - f2=""; + fprintf(f,"",i); + for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing)) + { + fprintf(f,"
%Lu", sharedip->direct); + } + fputs("\n",f); } + fputs("
%d%s%Lu M%Lu M%s%Lu M%s%Lu M%Lu M%Lu M%d k%d k%s%d k%s%s%d%s
%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
SUMMARY:"); - fprintf(f,"%Lu M%Lu M
%d CLASSES%Lu%Lu%Lu M%Lu M
\n",f); + { + fprintf(f,"%Lu\n", total_proxy); + } + fprintf(f,"%Lu", total_upload); + fprintf(f,"LIMIT %dx LOW-PRIO %dx\n\n",limit_count,prio_count); + row_odd_even = 0; if(active_classes>10) { - fputs("

\n",f); - fputs("\n",f); - fputs("\n",f); - - find(sum,sums,sum->l>=total/4) + int top20_count=0,top20_perc1=0; + long long top20_perc2=0; + unsigned long long top20_sum=0l; + + fputs("

Enterprise Research and Planning (ERP)
Analytic categoryActive ClassesData transfers
\n",f); + fputs("\n\ +\n\ +\n\ +\n\ +\n",f); + + if_exists(sum,sums,sum->l>=total_traffic/4) { - fprintf(f,"\n"); - fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); + 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); } - find(sum,sums,sum->i==10) + if_exists(sum,sums,sum->i==10) { - fprintf(f,"\n"); - fprintf(f,"\n",(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); + 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); } - find(sum,sums,sum->l>=total/2) + if_exists(sum,sums,sum->l>=total_traffic/2) { - fprintf(f,"\n"); - fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); + 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); } - find(sum,sums,sum->l>=4*total/5) + if_exists(sum,sums,sum->l>=4*total_traffic/5) { - fprintf(f,"\n"); - fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); + 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); } - find (sum,sums,sum->i>=(active_classes+1)/5) + if_exists(sum,sums,sum->i>=(active_classes+1)/5) { - fprintf(f,"\n"); - fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); + 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); } - find(sum,sums,sum->i>=(active_classes+1)/4) + if_exists(sum,sums,sum->i>=(active_classes+1)/4) { - fprintf(f,"\n"); - fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); + 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); } - find(sum,sums,sum->i>=(active_classes+1)/2) + if_exists(sum,sums,sum->i>=(active_classes+1)/2) { - fprintf(f,"\n"); - fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); + 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); } - find(sum,sums,sum->i>=4*(active_classes+1)/5) + if_exists(sum,sums,sum->i>=4*(active_classes+1)/5) { - fprintf(f,"\n"); - fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total); + 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"); - fprintf(f,"\n",active_classes,total); - fputs("
Enterprise Resource Planning (ERP)
Analytic categoryActive ClassesData transfers
Top 25%% of traffic%d%d %%%Lu M%Ld %%
Top 25%% of traffic%d%d %%%Lu MB%Ld %%
Top 10 downloaders10%d %%%Lu M%Ld %%
Top 10 downloaders10%d %%%Lu MB%Ld %%
Top 50%% of traffic%d%d %%%Lu M%Ld %%
Top 50%% of traffic%d%d %%%Lu MB%Ld %%
Top 80%% of traffic%d%d %%%Lu M%Ld %%
Top 80%% of traffic%d%d %%%Lu MB%Ld %%
Top 20%% downloaders%d%d %%%Lu M%Ld %%
Top 20%% downloaders%d%d %%%Lu MB%Ld %%
Top 25%% downloaders%d%d %%%Lu M%Ld %%
Top 25%% downloaders%d%d %%%Lu MB%Ld %%
Top 50%% downloaders%d%d %%%Lu M%Ld %%
Top 50%% downloaders%d%d %%%Lu MB%Ld %%
Top 80%% downloaders%d%d %%%Lu M%Ld %%
Top 80%% downloaders%d%d %%%Lu MB%Ld %%
All users, all traffic%d100 %%%Lu M100 %%
\n", f); + fprintf(f,"All users, all traffic\n", log_url); + fprintf(f,"%d\n\ +100 %%\n\ +%Lu MB\n\ +100 %%\n",active_classes,total_traffic); + fputs("\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); } if(just_preview) { - puts("Statistics preview generated (-p switch) - now exiting ..."); + char swchar='p'; + if(start_shaping) + { + swchar='s'; + } + printf("Statistics preview generated (-%c switch) - now exiting ...\n", swchar); exit(0); + } + + i=0; +#ifdef DEBUG + printf("%-22s %-15s mark\n","name","ip"); +#endif + + printf("Writing %s ... ", classmap); + f = fopen(classmap, "w"); + if(f < 0) + { + perror(classmap); } - + /*-----------------------------------------------------------------*/ - puts("Generating iptables and tc classes ..."); + puts("Generating iptables and tc classes ... "); /*-----------------------------------------------------------------*/ - i=0; - printf("%-22s %-15s mark\n","name","ip"); - search(ip,ips,ip->mark>0) - { - + for_each(ip, ips) if(ip->mark > 0) + { if(idxs) { char *buf; @@ -1510,55 +1670,70 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); chain_postrouting="POSTROUTING"; } +#ifdef DEBUG printf("%-22s %-16s %04d ", ip->name, ip->addr, ip->mark); +#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 %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); 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 %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 -d %s/32 -o %s -j ACCEPT",chain_postrouting,ip->addr,lan); + sprintf(str, "-A %s -d %s/32 -o %s -j ACCEPT", + chain_postrouting, ip->addr, lan); save_line(str); /* -------------------------------------------------------- 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 %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/32 -o %s -j ACCEPT",chain_forward,ip->addr,wan); + sprintf(str, "-A %s -s %s/32 -o %s -j ACCEPT", + chain_forward, ip->addr, wan); save_line(str); if(ip->min) { /* -------------------------------------------------------- download class */ +#ifdef DEBUG printf("(down: %dk-%dk ", ip->min, ip->max); +#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); + 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); safe_run(str); - if (strcmpi(ip->keyword->leaf_discipline, "none")) + 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*/ + 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) + } + + 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); + 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 */ +#ifdef DEBUG printf("up: %dk-%dk)\n", (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed)); +#endif sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", tc, wan, ip->group, ip->mark, @@ -1566,22 +1741,39 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio); safe_run(str); - if (strcmpi(ip->keyword->leaf_discipline, "none")) + 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*/ + 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) + + 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); + 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); + } } else + { +#ifdef DEBUG printf("(sharing %s)\n", ip->sharing); +#endif + } i++; } - + if(f > 0) + { + puts("done."); + fclose(f); + } + if(idxs) { chain_forward = "forw_common"; @@ -1595,31 +1787,36 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /* -------------------------------- classify or reject free download */ { char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */ - if(free_min) final_chain = "ACCEPT"; + 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); + 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); + 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); + 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); + 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); + 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); + sprintf(str,"-A %s -o %s -j %s", chain_forward, wan, final_chain); save_line(str); } @@ -1628,29 +1825,34 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /*-----------------------------------------------------------------*/ puts("Generating free bandwith classes ..."); /*-----------------------------------------------------------------*/ - sprintf(str,"%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio 2",tc,lan,parent,free_min,free_max,burst); + sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d", + tc, lan, parent, free_min, free_max,burst, lowest_priority); safe_run(str); - sprintf(str,"%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio 2",tc,wan,parent,free_min,free_max,burst); + sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d", + tc, wan, parent, free_min, free_max, burst, lowest_priority); safe_run(str); /* tc SFQ */ - if (strcmpi(qos_leaf, "none")) + 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:3 handle 3 %s", tc, lan, 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:3 handle 3 %s", tc, wan, 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 3 fw flowid 1:3", tc, lan); 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 3 fw flowid 1:3", tc, wan); safe_run(str); } printf("Total IP count: %d\n", i); run_restore(); - if (log_file) fclose(log_file); + if(log_file) + { + fclose(log_file); + } return 0; /* that's all folks, thank you for reading it all the way up to this point ;-) */ /* bad luck C<<1 is not yet finished, I promise no sprintf() next time... */