/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */\r
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
\r
-/* Modified by: xChaos, 20080728\r
+/* Modified by: xChaos, 20110221\r
ludva, 20080415\r
-\r
+ \r
Prometheus QoS is free software; you can redistribute it and/or\r
modify it under the terms of the GNU General Public License as \r
published by the Free Software Foundation; either version 2.1 of \r
#define FIRSTIPCLASS 2048\r
#undef DEBUG\r
\r
-#include "cll1-0.6.h"\r
+#include "cll1-0.6.2.h"\r
\r
-const char *version = "0.7.9-d"; \r
+const char *version = "0.8.3"; \r
\r
-/* Version numbers: 0.7.9 is development releases ("beta"), 0.8.0 will be "stable" */\r
+/* Version numbers: 0.8.3 is development releases ("beta"), 0.8.4 will be "stable" */\r
/* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */\r
/* C source code development versions ("beta"): 0.7.9-a, 0.8.1-b, etc. */\r
/* C source code release versions: 0.8.0, 0.8.2, 0.8.4, etc. */\r
char *iptables = "/sbin/iptables"; /* requires iptables utility */\r
char *iptablessave = "/sbin/iptables-save"; /* not yet required */\r
char *iptablesrestore = "/sbin/iptables-restore"; /* requires iptables-restore */\r
-char *ls = "/bin/ls"; /* this is not user configurable :-) */\r
+const char *ls = "/bin/ls"; /* this is not user configurable :-) */\r
\r
char *config = "/etc/prometheus/prometheus.conf"; /* main configuration file */\r
char *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition file */\r
puts("Command line switches:\n\\r
\n\\r
-?, --help this help screen\n\\r
--v, --version show version number of this utility and exit\n\\r
--c filename force alternative /etc/prometheus.conf filename\n\\r
--h filename force alternative /etc/hosts filename (overrides hosts keyword)\n\\r
--f just flush iptables and tc classes and exit (stop shaping)\n\\r
+-v, --version show Version number of this utility and exit\n\\r
+-c filename force alternative /etc/prometheus.Conf filename\n\\r
+-h filename force alternative /etc/Hosts filename (overrides hosts keyword)\n\\r
+-f just Flush iptables and tc classes and exit (stop shaping)\n\\r
-9 emergency iptables flush (do not read data transfer statistics)\n\\r
--p just generate preview of data transfer statistics and exit\n\\r
--n no delay (overrides qos-free-delay keyword)\n\\r
--d dry run (preview tc and iptables commands on stdout)\n\\r
--l Mmm YYYY generate HTML summary of traffic logs (Mmm=Jan-Dec or Year, YYYY=year)\n\\r
--m generate HTML summary of traffic logs for yesterday's month\n\\r
--y generate HTML summary of traffic logs for yesterday's year\n");\r
+-p just generate Preview of data transfer statistics and exit\n\\r
+-d Dry run (preview tc and iptables commands on stdout)\n\\r
+-r Run (reset all statistics and start shaping)\n\\r
+-n run Now (start shaping without delay - overrides qos-free-delay keyword)\n\\r
+-l Mmm YYYY generate HTML summary of traffic Logs (Mmm=Jan-Dec or Year, YYYY=year)\n\\r
+-m generate HTML summary of traffic logs for yesterday's Month\n\\r
+-y generate HTML summary of traffic logs for yesterday's Year\n");\r
/* not yet implemented:\r
-s start shaping! (keep data transfer statistics - but apply shaping)\n\\r
--r just reload configuration (...and keep data transfer statistics)\n\\r
*/\r
}\r
/* === Configuraration file values defaults - stored in global variables ==== */\r
int qos_free_delay = 0; /* seconds to sleep before applying new QoS rules */\r
int digital_divide = 2; /* controls digital divide weirdness ratio, 1...3 */ \r
int max_nesting = 3; /* maximum nesting of HTB clases, built-in maximum seems to be 4 */\r
-int htb_r2q = 1; \r
+int htb_r2q = 256; /* should work for leaf values 512 kbps to 8 Mbps */\r
int burst = 8; /* HTB burst (in kbits) */\r
int burst_main = 64;\r
int burst_group = 32;\r
-int magic_priorities = 8; /* number of priority levels (soft shaping) */\r
int magic_treshold = 8; /* reduce ceil by X*magic_treshhold kbps (hard shaping) */\r
int keywordcount = 0;\r
/* not yet implemented:\r
FILE *log_file = NULL;\r
char *kwd = "via-prometheus"; /* /etc/hosts comment, eg. #qos-64-128 */\r
\r
-const int idxtable_treshold1=24; /* this is no longer configurable */\r
-const int idxtable_treshold2=12; /* this is no longer configurable */\r
-const int idxtable_bitmask1=3; /* this is no longer configurable */\r
-const int idxtable_bitmask2=3; /* this is no longer configurable */\r
+const int highest_priority = 0; /* highest HTB priority (HTB built-in value is 0) */\r
+const int lowest_priority = 7; /* lowest HTB priority (HTB built-in value is 7) */\r
+const int idxtable_treshold1 = 24; /* this is no longer configurable */\r
+const int idxtable_treshold2 = 12; /* this is no longer configurable */\r
+const int idxtable_bitmask1 = 3; /* this is no longer configurable */\r
+const int idxtable_bitmask2 = 3; /* this is no longer configurable */\r
\r
/* ==== This is C<<1 stuff - learn C<<1 first! http://cll1.arachne.cz ==== */\r
\r
int asymetry_ratio; /* ratio for ADSL-like upload */\r
int asymetry_fixed; /* fixed treshold for ADSL-like upload */\r
int data_limit; /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */\r
- int data_prio; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */\r
+ int data_prio; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */\r
long fixed_limit; /* fixed data limit for setting lower HTB ceil */\r
long fixed_prio; /* fixed data lmit for setting lower HTB prio */\r
int reserve_min; /* bonus for nominal HTB rate bandwidth (in kbps) */\r
void TheIP(void)\r
{\r
create(ip,IP);\r
- ip->name="";\r
- ip->addr="";\r
- ip->sharing=NULL;\r
- ip->prio=1;\r
- ip->fixedprio=0;\r
- ip->mark=ip->min=ip->max=ip->desired=ip->credit=0;\r
- ip->upload=ip->proxy=ip->direct=ip->traffic=0;\r
- ip->pktsup=ip->pktsdown=0;\r
- ip->keyword=keywords;\r
+ ip->name = "";\r
+ ip->addr = "";\r
+ ip->sharing = NULL;\r
+ ip->prio = highest_priority+1;\r
+ ip->fixedprio = 0;\r
+ ip->mark = \\r
+ ip->min = \\r
+ ip->max = \\r
+ ip->desired = \\r
+ ip->credit = \\r
+ ip->upload = \\r
+ ip->proxy = \\r
+ ip->direct = \\r
+ ip->traffic = \\r
+ ip->pktsup = \\r
+ ip->pktsdown = 0;\r
+ ip->keyword = keywords;\r
push(ip,ips);\r
}\r
\r
keyword->asymetry_ratio=1; /* ratio for ADSL-like upload */\r
keyword->asymetry_fixed=0; /* fixed treshold for ADSL-like upload */\r
keyword->data_limit=8; /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */\r
- keyword->data_prio=4; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */\r
+ keyword->data_prio=4; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */\r
keyword->fixed_limit=0; /* fixed data limit for setting lower HTB ceil */\r
keyword->fixed_prio=0; /* fixed data limit for setting lower HTB prio */\r
keyword->reserve_min=8; /* bonus for nominal HTB rate bandwidth (in kbps) */\r
keyword->reserve_max=0; /* malus for nominal HTB ceil (in kbps) */\r
/* obsolete:\r
keyword->divide_max=0; relative malus: new_ceil=rate+(old_ceil-rate)/divide_max\r
- keyword->htb_ceil_bonus_divide=0; relative bonus: new_ceil=old_ceil+old_ceil/htb_ceil_bonus_divide\r
-*/\r
- keyword->default_prio=1;\r
+ keyword->htb_ceil_bonus_divide=0; relative bonus: new_ceil=old_ceil+old_ceil/htb_ceil_bonus_divide */\r
+ keyword->default_prio=highest_priority+1;\r
keyword->html_color="000000";\r
keyword->ip_count=0;\r
keyword->leaf_discipline="";\r
\r
kwd=NULL;\r
}\r
- else every(keyword,keywords)\r
+ else\r
{\r
- int l=strlen(keyword->key);\r
+ for_each(keyword,keywords)\r
+ {\r
+ int l=strlen(keyword->key);\r
\r
\r
- if(!strncmp(keyword->key,_,l) && strlen(_)>l+2)\r
- {\r
- char *tmptr=_; /* <---- l+1 ----> */\r
- _+=l+1; /* via-prometheus-asymetry-ratio, etc. */\r
- ioption("asymetry-ratio",keyword->asymetry_ratio);\r
- ioption("asymetry-treshold",keyword->asymetry_fixed);\r
- ioption("magic-relative-limit",keyword->data_limit);\r
- ioption("magic-relative-prio",keyword->data_prio);\r
- loption("magic-fixed-limit",keyword->fixed_limit);\r
- loption("magic-fixed-prio",keyword->fixed_prio);\r
- ioption("htb-default-prio",keyword->default_prio);\r
- ioption("htb-rate-bonus",keyword->reserve_min);\r
- ioption("htb-ceil-malus",keyword->reserve_max);\r
-/* obsolete:\r
- ioption("htb-ceil-divide",keyword->divide_max);\r
- ioption("htb-ceil-bonus-divide",keyword->htb_ceil_bonus_divide);\r
-*/\r
- option("leaf-discipline",keyword->leaf_discipline);\r
- option("html-color",keyword->html_color);\r
- _=tmptr;\r
- \r
- if(keyword->data_limit || keyword->fixed_limit || \r
- keyword->data_prio || keyword->fixed_prio)\r
- use_credit=1; \r
- }\r
+ if(!strncmp(keyword->key,_,l) && strlen(_)>l+2)\r
+ {\r
+ char *tmptr=_; /* <---- l+1 ----> */\r
+ _+=l+1; /* via-prometheus-asymetry-ratio, etc. */\r
+ ioption("asymetry-ratio",keyword->asymetry_ratio);\r
+ ioption("asymetry-treshold",keyword->asymetry_fixed);\r
+ ioption("magic-relative-limit",keyword->data_limit);\r
+ ioption("magic-relative-prio",keyword->data_prio);\r
+ loption("magic-fixed-limit",keyword->fixed_limit);\r
+ loption("magic-fixed-prio",keyword->fixed_prio);\r
+ ioption("htb-default-prio",keyword->default_prio);\r
+ ioption("htb-rate-bonus",keyword->reserve_min);\r
+ ioption("htb-ceil-malus",keyword->reserve_max);\r
+ /* obsolete:\r
+ ioption("htb-ceil-divide",keyword->divide_max);\r
+ ioption("htb-ceil-bonus-divide",keyword->htb_ceil_bonus_divide);\r
+ */\r
+ option("leaf-discipline",keyword->leaf_discipline);\r
+ option("html-color",keyword->html_color);\r
+ _=tmptr;\r
+ \r
+ if(keyword->data_limit || keyword->fixed_limit || \r
+ keyword->data_prio || keyword->fixed_prio)\r
+ use_credit=1; \r
+ }\r
+ }\r
}\r
\r
option("tc",tc);\r
ioption("htb-nesting-limit",max_nesting);\r
ioption("htb-r2q",htb_r2q);\r
ioption("magic-include-upload",include_upload);\r
- ioption("magic-priorities",magic_priorities);\r
ioption("magic-treshold",magic_treshold); \r
option("filter-type", cnf);\r
\r
printf("\n");\r
\r
/*leaf discipline for keywords*/\r
- every(keyword,keywords)\r
+ for_each(keyword,keywords)\r
{\r
- if (!strcmpi(keyword->leaf_discipline, "")){\r
+ if (!strcmpi(keyword->leaf_discipline, ""))\r
+ {\r
keyword->leaf_discipline = qos_leaf;\r
}\r
}\r
append(line,lines);\r
}\r
\r
- every(line,lines)\r
+ for_each(line,lines)\r
{\r
int col, accept=0,proxyflag=0,valid=1,setchainname=0,commonflag=0; \r
unsigned long long traffic=0;\r
if(proxyflag)printf("(proxy) ");\r
else if(!downloadflag) printf("(upload) ");\r
printf("IP %s: %Lu M (%ld pkts)\n", ipaddr, traffic, pkts);\r
- find(ip,ips,eq(ip->addr,ipaddr)); \r
+\r
+ if_exists(ip,ips,eq(ip->addr,ipaddr)); \r
else \r
{\r
TheIP();\r
ptr++;\r
*ptr=0;\r
\r
- find(ip,ips,eq(ip->addr,ipaddr)); else TheIP();\r
+ if_exists(ip,ips,eq(ip->addr,ipaddr));\r
+ else\r
+ {\r
+ TheIP();\r
+ }\r
ip->addr=ipaddr;\r
ip->name=ipname;\r
}\r
char *name;\r
long traffic;\r
long guaranted;\r
+ int i;\r
+ long l;\r
list(IpLog);\r
} *iplog,*iplogs;\r
\r
void parse_ip_log(int argc, char **argv) \r
{\r
- char *month, *year, *str, *name, *ptr, *ptr2;\r
- long traffic, traffic_month, total=0, guaranted;\r
+ char *month, *year, *str, *name="(undefined)", *ptr, *ptr2, *filename;\r
+ long traffic=0l, traffic_month, total=0, guaranted;\r
int col, col2, y_ok, m_ok, accept_month, i=1, any_month=0;\r
char mstr[4], ystr[5];\r
FILE *f; \r
string(str,STRLEN);\r
+ string(filename,STRLEN);\r
\r
if(argv[1][1]=='l') /* -l */\r
{\r
- if(argc<4)\r
- {\r
- puts("Missing parameter(s)!\nUsage: prometheus -l Mmm YYYY (Mmm=Jan-Dec or Year, YYYY=year)");\r
- exit(-1);\r
- }\r
- else\r
- {\r
- month=argv[2];\r
- if(eq(month,"Year")) any_month=1;\r
- year=argv[3];\r
- }\r
+ if(argc<4)\r
+ {\r
+ puts("Missing parameter(s)!\nUsage: prometheus -l Mmm YYYY (Mmm=Jan-Dec or Year, YYYY=year)");\r
+ exit(-1);\r
+ }\r
+ else\r
+ {\r
+ month=argv[2];\r
+ if(eq(month,"Year")) any_month=1;\r
+ year=argv[3];\r
+ }\r
}\r
else\r
{ \r
- time_t t = time(NULL) - 3600*24 ; /* yesterday's timestamp*/\r
- struct tm *timep = localtime(&t); \r
- \r
- if(argv[1][1]=='m') /* -m yestarday - month */\r
- {\r
- strftime(mstr, 4, "%b", timep);\r
- month=mstr;\r
- strftime(ystr, 5, "%Y", timep);\r
- year=ystr; \r
- }\r
- else /* -y yesterday - year */\r
- {\r
- month="Year";\r
- any_month=1;\r
- strftime(ystr, 5, "%Y", timep);\r
- year=ystr;\r
- }\r
+ time_t t = time(NULL) - 3600*24 ; /* yesterday's timestamp*/\r
+ struct tm *timep = localtime(&t); \r
+\r
+ if(argv[1][1]=='m') /* -m yestarday - month */\r
+ {\r
+ strftime(mstr, 4, "%b", timep);\r
+ month=mstr;\r
+ strftime(ystr, 5, "%Y", timep);\r
+ year=ystr; \r
+ }\r
+ else /* -y yesterday - year */\r
+ {\r
+ month="Year";\r
+ any_month=1;\r
+ strftime(ystr, 5, "%Y", timep);\r
+ year=ystr;\r
+ }\r
}\r
printf("Analysing traffic for %s %s ...\n",month,year);\r
\r
- sprintf(str,"%s %s/*.log",ls,log_dir);\r
+ /* sorry... next release of C<<1 header file will include for_path_files(name,path) { } macro */\r
+ sprintf(str,"%s %s/",ls,log_dir);\r
shell(str);\r
-\r
- input(str,STRLEN)\r
+ input(str,STRLEN) \r
{\r
- ptr=strrchr(str,'\n');\r
- if(ptr) *ptr='\0';\r
- printf("Parsing %s ...",str);\r
- accept_month=0;\r
- traffic_month=0;\r
- guaranted = 0;\r
- parse(str)\r
+ if(strstr(str,".log"))\r
{\r
- y_ok=m_ok=0; \r
- valid_columns(ptr,_,'\t',col) switch(col)\r
- {\r
- case 2: name = ptr;break;\r
- case 3: traffic = atol(ptr);break;\r
- /* column number - was 7, now 10...*/\r
- case 7:\r
- case 8:\r
- case 9:\r
- case 10: if (isalpha(*ptr)) /* character, not numeric string = date, just one*/\r
- {\r
- valid_columns(ptr2,ptr,' ',col2) switch(col2)\r
+ ptr=strrchr(str,'\n');\r
+ if(ptr) *ptr='\0';\r
+ sprintf(filename,"%s/%s",log_dir,str);\r
+ printf("Parsing %s ...",filename);\r
+ accept_month=0;\r
+ traffic_month=0;\r
+ guaranted = 0;\r
+ parse(filename)\r
+ {\r
+ y_ok=m_ok=0; \r
+ valid_columns(ptr,_,'\t',col) switch(col)\r
+ {\r
+ case 2: name = ptr;break;\r
+ case 3: traffic = atol(ptr);break;\r
+ /* column number - was 7, now 10...*/\r
+ case 7:\r
+ case 8:\r
+ case 9:\r
+ case 10: if (isalpha(*ptr)) /* character, not numeric string = date, just one*/\r
{\r
- case 2: if(any_month || eq(ptr2,month)) m_ok = 1; break;\r
- case 5: if(eq(ptr2,year)) y_ok = 1; break;\r
+ valid_columns(ptr2,ptr,' ',col2) switch(col2)\r
+ {\r
+ case 2: if(any_month || eq(ptr2,month)) m_ok = 1; break;\r
+ case 5: if(eq(ptr2,year)) y_ok = 1; break;\r
+ }\r
}\r
- }\r
- else\r
- {\r
- if(col == 7) guaranted = atol(ptr);\r
- }\r
- }\r
- \r
- if(y_ok && m_ok) \r
- {\r
- traffic_month += traffic;\r
- accept_month = 1;\r
- }\r
- }\r
- done;\r
+ else\r
+ {\r
+ if(col == 7) guaranted = atol(ptr);\r
+ }\r
+ }\r
+ \r
+ if(y_ok && m_ok) \r
+ {\r
+ traffic_month += traffic;\r
+ accept_month = 1;\r
+ }\r
+ }\r
+ done;\r
\r
- if(accept_month)\r
- {\r
- create(iplog,IpLog);\r
- iplog->name = name;\r
- iplog->guaranted = guaranted;\r
- iplog->traffic = traffic_month;\r
- insert(iplog,iplogs,desc_order_by,traffic);\r
- printf(" %ld MB\n",iplog->traffic);\r
+ if(accept_month)\r
+ {\r
+ create(iplog,IpLog);\r
+ iplog->name = name;\r
+ iplog->guaranted = guaranted;\r
+ iplog->traffic = traffic_month;\r
+ insert(iplog,iplogs,desc_order_by,traffic);\r
+ printf(" %ld MB\n",iplog->traffic);\r
+ }\r
+ else\r
+ {\r
+ puts(" no records.");\r
+ }\r
}\r
- else\r
- puts(" no records.");\r
}\r
sprintf(str,"%s/%s-%s.html",html_log_dir,year,month);\r
printf("Writing %s ...",str);\r
if(f)\r
{\r
fprintf(f,"<table border><tr><th colspan=\"2\">%s %s</th><th colspan=\"2\">Data transfers</th><th align=\"right\">Min.speed</th></tr>\n ",month,year);\r
- every(iplog,iplogs)\r
+\r
+ for_each(iplog,iplogs)\r
+ {\r
if(iplog->traffic)\r
{\r
- fprintf(f,"<tr><td align=\"right\">%d</td><th align=\"left\">%s</td><td align=\"right\">%ld MB</td><th align=\"right\">%ld GB</th><td align=\"right\">%ld kbps</th></tr>\n",\r
+ fprintf(f,"<tr><td align=\"right\">%d</td><th align=\"left\">%s</td><td align=\"right\">%ld M</td><th align=\"right\">%ld G</th><td align=\"right\">%ld kbps</th></tr>\n",\r
i++, iplog->name, iplog->traffic, iplog->traffic>>10, iplog->guaranted);\r
total+=iplog->traffic>>10;\r
+ iplog->i=i;\r
+ iplog->l=total;\r
}\r
+ }\r
fprintf(f,"<tr><th colspan=\"3\" align=\"left\">Total:</th><th align=\"right\">%ld GB</th><th align=\"right\">%Ld kbps</th></tr>\n", total, line);\r
fputs("</table>\n", f);\r
+\r
+ if(i>10)\r
+ {\r
+ fputs("<a name=\"erp\"></a><p><table border><tr><th colspan=\"5\">Enterprise Research and Planning (ERP)</th></tr>\n",f);\r
+ fputs("<tr><td>Analytic category</td>\n",f);\r
+ fputs("<td colspan=\"2\" align=\"center\">Active Classes</td><td colspan=\"2\" align=\"center\">Data transfers</td></tr>\n",f);\r
+\r
+ if_exists(iplog,iplogs,iplog->l>=total/4)\r
+ {\r
+ fprintf(f,"<tr><td>Top 25%% of traffic</td>\n");\r
+ fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><td align=\"right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+ }\r
+ \r
+ if_exists(iplog,iplogs,iplog->i==10)\r
+ {\r
+ fprintf(f,"<tr><td>Top 10 downloaders</td>\n");\r
+ fprintf(f,"<th align=\"right\">10</th><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><td align=\"right\">%d %%</td></tr>\n",(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+ }\r
+\r
+ if_exists(iplog,iplogs,iplog->l>=total/2)\r
+ {\r
+ fprintf(f,"<tr><td>Top 50%% of traffic</td>\n");\r
+ fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><th align=\"right\">%d %%</th></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+ }\r
+\r
+ if_exists(iplog,iplogs,iplog->l>=4*total/5)\r
+ {\r
+ fprintf(f,"<tr><td>Top 80%% of traffic</td>\n");\r
+ fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><th align=\"right\">%d %%</th></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+ }\r
+\r
+ if_exists (iplog,iplogs,iplog->i>=i/5)\r
+ {\r
+ fprintf(f,"<tr><td>Top 20%% downloaders</td>\n");\r
+ fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%ld G</td><td align=\"right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+ }\r
+\r
+ if_exists(iplog,iplogs,iplog->i>=i/4)\r
+ {\r
+ fprintf(f,"<tr><td>Top 25%% downloaders</td>\n");\r
+ fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><td align=\"right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+ }\r
+\r
+ if_exists(iplog,iplogs,iplog->i>=i/2)\r
+ {\r
+ fprintf(f,"<tr><td>Top 50%% downloaders</td>\n");\r
+ fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%ld G</td><td align=\"right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+ }\r
+\r
+ if_exists(iplog,iplogs,iplog->i>=4*i/5)\r
+ {\r
+ fprintf(f,"<tr><td>Top 80%% downloaders</td>\n");\r
+ fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><td align=\"right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
+ }\r
+\r
+ fprintf(f,"<tr><td>All users, all traffic</td>\n");\r
+ fprintf(f,"<th align=\"right\">%d</th><th align=\"right\">100 %%</th><th align=\"right\">%ld G</th><th align=\"right\">100 %%</th></tr>\n",i-1,total);\r
+ fputs("</table>\n", f);\r
+ }\r
+\r
fprintf(f, stats_html_signature, version);\r
fclose(f);\r
puts(" done.");\r
}\r
}\r
\r
-\r
/*-----------------------------------------------------------------*/\r
-/* Are you looking for int main (int argc, char **argv) ? :-)) */\r
+/* Are you looking for int main(int argc, char **argv) ? :-)) */\r
/*-----------------------------------------------------------------*/\r
\r
program\r
char *substring;\r
int class_count=0,ip_count=0;\r
int parent=1;\r
- int just_flush=0;\r
- int nodelay=0;\r
- int just_preview=0; /* preview - generate just stats */\r
- int just_logs=0; /* just parse logs */\r
+ int just_flush=FALSE;\r
+ int nodelay=FALSE;\r
+ int just_preview=FALSE; /* preview - generate just stats */\r
+ int just_logs=FALSE; /* just parse logs */\r
+ int run=FALSE;\r
\r
char *chain_forward, *chain_postrouting;\r
char *althosts=NULL;\r
{\r
argument("-c") { nextargument(config); }\r
argument("-h") { nextargument(althosts);}\r
- argument("-d") { dry_run=1; }\r
- argument("-f") { just_flush=1; }\r
- argument("-9") { just_flush=9; }\r
- argument("-p") { just_preview=1; }\r
- argument("-n") { nodelay=1; }\r
- argument("-l") { just_logs=1; }\r
- argument("-m") { just_logs=1; }\r
- argument("-y") { just_logs=1; }\r
+ argument("-d") { run=TRUE; dry_run=TRUE; }\r
+ argument("-f") { run=TRUE; just_flush=TRUE; }\r
+ argument("-9") { run=TRUE; just_flush=9; }\r
+ argument("-p") { run=TRUE; just_preview=TRUE; }\r
+ argument("-r") { run=TRUE; }\r
+ argument("-n") { run=TRUE; nodelay=TRUE; }\r
+ argument("-l") { just_logs=TRUE; }\r
+ argument("-m") { just_logs=TRUE; }\r
+ argument("-y") { just_logs=TRUE; }\r
argument("-?") { help(); exit(0); }\r
argument("--help") { help(); exit(0); }\r
argument("-v") { exit(0); } \r
argument("--version") { exit(0); } \r
}\r
-\r
+ \r
if(dry_run)\r
+ {\r
puts("*** THIS IS JUST DRY RUN ! ***\n");\r
+ }\r
\r
- date(d); /* this is typical cll1.h macro */\r
+ date(d); /* this is typical cll1.h macro - prints current date */\r
\r
/*-----------------------------------------------------------------*/\r
printf("Parsing configuration file %s ...\n", config);\r
\r
if(just_logs)\r
{\r
- parse_ip_log(argc,argv);\r
- exit(0);\r
+ parse_ip_log(argc,argv);\r
+ exit(0);\r
+ }\r
+ else if(not run)\r
+ {\r
+ help();\r
+ exit(0);\r
}\r
\r
- if(althosts) hosts=althosts;\r
+ if(althosts)\r
+ {\r
+ hosts=althosts;\r
+ }\r
\r
if(just_flush<9)\r
{\r
{\r
//Do we have to create new QoS class for this IP ?\r
\r
- find(keyword,keywords,(substring=strstr(str,keyword->key)))\r
+ if_exists(keyword,keywords,(substring=strstr(str,keyword->key)))\r
{\r
parse_ip(str);\r
ip_count++;\r
}\r
ip->mark=FIRSTIPCLASS+1+class_count++;\r
\r
- find(group,groups,group->min==ip->min) \r
+ if_exists(group,groups,group->min==ip->min) \r
{ \r
group->count++; \r
group->desired+=ip->min;\r
/*-----------------------------------------------------------------*/\r
puts("Resolving shared connections ...");\r
/*-----------------------------------------------------------------*/\r
- search(ip,ips,ip->sharing)\r
+ for_selected(ip,ips,ip->sharing)\r
{\r
- search(sharedip,ips,eq(sharedip->name,ip->sharing))\r
+ for_selected(sharedip,ips,eq(sharedip->name,ip->sharing))\r
{\r
sharedip->traffic+=ip->traffic;\r
ip->traffic=0;\r
ptr=parse_datafile_line(_);\r
if(ptr)\r
{\r
- find(ip,ips,eq(ip->addr,_))\r
+ if_exists(ip,ips,eq(ip->addr,_))\r
+ {\r
sscanf(ptr,"%Lu",&(ip->credit));\r
+ }\r
}\r
}\r
done;\r
save_line(":post_common - [0:0]");\r
save_line(":forw_common - [0:0]");\r
\r
- search(ip,ips,ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0"))\r
+ for_selected(ip,ips,ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0"))\r
{\r
buf=hash_id(ip->addr,bitmask);\r
- find(idx,idxs,eq(idx->id,buf))\r
+ if_exists(idx,idxs,eq(idx->id,buf))\r
+ {\r
idx->children++;\r
+ }\r
else\r
{\r
create(idx,Index);\r
{\r
bitmask-=idxtable_bitmask2;\r
idxcount=0;\r
- search(idx,idxs,idx->parent==NULL)\r
+\r
+ for_selected(idx,idxs,idx->parent==NULL)\r
{\r
buf=hash_id(idx->addr,bitmask);\r
- find(metaindex,idxs,eq(metaindex->id,buf))\r
- metaindex->children++; \r
+ if_exists(metaindex,idxs,eq(metaindex->id,buf))\r
+ {\r
+ metaindex->children++;\r
+ }\r
else\r
{\r
create(metaindex,Index);\r
sort(idx,idxs,order_by,bitmask);\r
\r
i=0;\r
- every(idx,idxs)\r
+\r
+ for_each(idx,idxs)\r
{\r
subnet=subnet_id(idx->addr,idx->bitmask);\r
printf("%d: %s/%d\n",++i,subnet,idx->bitmask);\r
sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",tc,lan,htb_r2q);\r
safe_run(str);\r
\r
- 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);\r
+ sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d",\r
+ tc,lan,lan_medium,lan_medium,burst_main,highest_priority);\r
safe_run(str);\r
\r
- 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);\r
+ sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d",\r
+ tc,lan,line,line,burst_main,highest_priority);\r
safe_run(str);\r
\r
sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",tc,wan,htb_r2q);\r
safe_run(str);\r
\r
- 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);\r
+ sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d",\r
+ tc,wan,wan_medium,wan_medium,burst_main,highest_priority);\r
safe_run(str);\r
\r
- 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);\r
+ sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d",\r
+ tc,wan,up,up,burst_main,highest_priority);\r
safe_run(str);\r
}\r
\r
/*-----------------------------------------------------------------*/\r
- puts("Locating suckers and generating root classes ...");\r
+ puts("Locating heavy downloaders and generating root classes ...");\r
/*-----------------------------------------------------------------*/\r
sort(ip,ips,desc_order_by,traffic);\r
\r
\r
if(!just_preview && !dry_run && enable_credit) credit_file=fopen(credit,"w");\r
\r
- every(group,groups)\r
+ for_each(group,groups)\r
{\r
if(!just_preview)\r
{\r
- \r
//download\r
- 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", \r
- tc, lan, parent, group->id, rate, max, burst_group, group->desired);\r
+ 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", \r
+ tc, lan, parent, group->id, rate, max, burst_group, highest_priority+1, group->desired);\r
safe_run(str);\r
\r
//upload\r
- 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", \r
- tc, wan, parent, group->id, rate*up/line, max*up/line, burst_group, group->desired);\r
+ 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", \r
+ tc, wan, parent, group->id, rate*up/line, max*up/line, burst_group, highest_priority+1, group->desired);\r
safe_run(str);\r
}\r
\r
/*shaping of aggresive downloaders, with credit file support */\r
if(use_credit)\r
{\r
- int group_rate=group->min, priority_sequence=magic_priorities+1;\r
+ int group_rate=group->min, priority_sequence=lowest_priority;\r
\r
- search(ip, ips, ip->min==group->min && ip->max>ip->min)\r
+ for_selected(ip, ips, ip->min==group->min && ip->max>ip->min)\r
{\r
if( ip->keyword->data_limit && !ip->fixedprio &&\r
ip->traffic>ip->credit+\r
{\r
if(group_rate<ip->max) ip->max=group_rate;\r
group_rate+=magic_treshold;\r
- ip->prio=magic_priorities+2;\r
- if(ip->prio<3) ip->prio=3;\r
+ ip->prio=lowest_priority;\r
+ if(ip->prio<highest_priority+2) ip->prio=highest_priority+2;\r
}\r
else\r
{\r
(ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20)) )\r
{\r
ip->prio=priority_sequence--;\r
- if(ip->prio<2) ip->prio=2;\r
+ if(ip->prio<highest_priority+1) ip->prio=highest_priority+1;\r
}\r
\r
if(credit_file)\r
f=fopen("/var/run/prometheus.previous","w");\r
if(f)\r
{\r
- search(ip,ips,ip->traffic || ip->direct || ip->proxy ||ip->upload)\r
+ for_selected(ip,ips,ip->traffic || ip->direct || ip->proxy ||ip->upload)\r
fprintf(f,"%s %Lu %Lu %Lu %Lu\n",ip->addr,ip->traffic,ip->direct,ip->proxy,ip->upload);\r
fclose(f);\r
}\r
fputs("<table border>\n<tr><th align=\"right\">#</th><th align=\"right\">group</th><th align=\"right\">IPs</th><th align=\"right\">requested</th>\n",f);\r
fprintf(f,"<th colspan=\"%d\">data limits</th>\n",keywordcount);\r
fputs("</tr>\n",f);\r
- every(group,groups) \r
+\r
+ for_each(group,groups) \r
{ \r
#ifdef DEBUG\r
printf("%d k group: %d bandwidth requested: %d k\n",group->min,group->count,group->desired);\r
fprintf(f,"<tr><td align=\"right\">%d</td><td align=\"right\">%d k</td>",count,group->min);\r
fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d k</td>",group->count,group->desired);\r
\r
- every(keyword,keywords)\r
- fprintf(f,"<td align=\"right\"><font color=\"#%s\">%d M</font></td>",keyword->html_color,group->min*keyword->data_limit); \r
- \r
+ for_each(keyword,keywords)\r
+ {\r
+ fprintf(f,"<td align=\"right\"><font color=\"#%s\">%d M</font></td>",keyword->html_color,group->min*keyword->data_limit);\r
+ } \r
i+=group->desired; \r
total+=group->count;\r
count++; \r
fprintf(f,"<tr><th colspan=\"2\" align=\"left\">Line %Ld k</td>",line);\r
fprintf(f,"<th align=\"right\">%d</td><th align=\"right\">%d k</td>",total,i);\r
\r
- every(keyword,keywords)\r
- fprintf(f,"<th align=\"right\">%d IPs</th>",keyword->ip_count); \r
-\r
+ for_each(keyword,keywords)\r
+ {\r
+ fprintf(f,"<th align=\"right\">%d IPs</th>",keyword->ip_count);\r
+ }\r
fprintf(f,"</tr><tr><th colspan=\"4\">Aggregation 1/%d</th>\n",(int)(0.5+i/line));\r
fprintf(f,"<th colspan=\"%d\">%d traffic classes</th></tr>\n",keywordcount,total);\r
\r
<td align=\"right\">maximum</td>\\r
<td>prio</td></tr>\n",f); \r
\r
- every(ip,ips)\r
+ for_each(ip,ips)\r
{\r
char *f1="", *f2="";\r
if(ip->max<ip->desired)\r
f1="<font color=\"red\">";\r
f2="</font>";\r
}\r
- else if(ip->prio>1)\r
+ else if(ip->prio>highest_priority+1)\r
{\r
f1="<font color=\"brown\">";\r
f2="</font>";\r
fputs("<tr><td>Analytic category</td>\n",f);\r
fputs("<td colspan=\"2\" align=\"center\">Active Classes</td><td colspan=\"2\" align=\"center\">Data transfers</td></tr>\n",f);\r
\r
- find(sum,sums,sum->l>=total/4)\r
+ if_exists(sum,sums,sum->l>=total/4)\r
{\r
fprintf(f,"<tr><td>Top 25%% of traffic</td>\n");\r
fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
}\r
\r
- find(sum,sums,sum->i==10)\r
+ if_exists(sum,sums,sum->i==10)\r
{\r
fprintf(f,"<tr><td>Top 10 downloaders</td>\n");\r
fprintf(f,"<th align=\"right\">10</th><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
}\r
\r
- find(sum,sums,sum->l>=total/2)\r
+ if_exists(sum,sums,sum->l>=total/2)\r
{\r
fprintf(f,"<tr><td>Top 50%% of traffic</td>\n");\r
fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><th align=\"right\">%Ld %%</th></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
}\r
\r
- find(sum,sums,sum->l>=4*total/5)\r
+ if_exists(sum,sums,sum->l>=4*total/5)\r
{\r
fprintf(f,"<tr><td>Top 80%% of traffic</td>\n");\r
fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><th align=\"right\">%Ld %%</th></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
}\r
\r
- find (sum,sums,sum->i>=(active_classes+1)/5)\r
+ if_exists (sum,sums,sum->i>=(active_classes+1)/5)\r
{\r
fprintf(f,"<tr><td>Top 20%% downloaders</td>\n");\r
fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
}\r
\r
- find(sum,sums,sum->i>=(active_classes+1)/4)\r
+ if_exists(sum,sums,sum->i>=(active_classes+1)/4)\r
{\r
fprintf(f,"<tr><td>Top 25%% downloaders</td>\n");\r
fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
}\r
\r
- find(sum,sums,sum->i>=(active_classes+1)/2)\r
+ if_exists(sum,sums,sum->i>=(active_classes+1)/2)\r
{\r
fprintf(f,"<tr><td>Top 50%% downloaders</td>\n");\r
fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
}\r
\r
- find(sum,sums,sum->i>=4*(active_classes+1)/5)\r
+ if_exists(sum,sums,sum->i>=4*(active_classes+1)/5)\r
{\r
fprintf(f,"<tr><td>Top 80%% downloaders</td>\n");\r
fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
\r
i=0;\r
printf("%-22s %-15s mark\n","name","ip");\r
- search(ip,ips,ip->mark>0)\r
+\r
+ for_selected(ip,ips,ip->mark>0)\r
{ \r
\r
if(idxs)\r
/*-----------------------------------------------------------------*/\r
puts("Generating free bandwith classes ...");\r
/*-----------------------------------------------------------------*/\r
- 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);\r
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
+ tc,lan,parent,free_min,free_max,burst,lowest_priority);\r
safe_run(str);\r
- 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);\r
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
+ tc,wan,parent,free_min,free_max,burst,lowest_priority);\r
safe_run(str);\r
/* tc SFQ */\r
if (strcmpi(qos_leaf, "none"))\r
GIT.Harvie.CZ / svn / Prometheus-QoS / .git / blobdiff