/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */\r
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
\r
-/* Modified: xChaos, 20080504\r
- ludva, 20080415\r
+/* Modified by: xChaos, 20080728\r
+ ludva, 20080415\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
\r
#include "cll1-0.6.h"\r
\r
-const char *version = "0.7.9-c"; \r
+const char *version = "0.8.1-b"; \r
\r
/* Version numbers: 0.7.9 is development releases ("beta"), 0.8.0 will be "stable" */\r
/* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */\r
\r
void parse_ip_log(int argc, char **argv) \r
{\r
- char *month, *year, *str, *name, *ptr, *ptr2;\r
+ char *month, *year, *str, *name, *ptr, *ptr2, *filename;\r
long traffic, 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
}\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
+ puts(" no records.");\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
f=fopen(str,"w");\r
if(f)\r
{\r
- fprintf(f,"<table border><tr><th colspan=\"4\">Data transfers - %s %s</th><th align=\"right\">Min.speed</th></tr>\n ",month,year);\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
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><th 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 MB</td><th align=\"right\">%ld GB</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
}\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
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);\r
safe_run(str);\r
\r
- if (strcmpi(ip->keyword->leaf_discipline, "none")){\r
- 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*/\r
- safe_run(str);\r
- }\r
- \r
- if (filter_type == 1){\r
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, lan, ip->mark, ip->mark);\r
- safe_run(str);\r
+ if (strcmpi(ip->keyword->leaf_discipline, "none"))\r
+ {\r
+ 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*/\r
+ safe_run(str);\r
+ } \r
+ if (filter_type == 1)\r
+ {\r
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, lan, ip->mark, ip->mark);\r
+ safe_run(str);\r
}\r
\r
/* -------------------------------------------------------- upload class */\r
(int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio);\r
safe_run(str);\r
\r
- if (strcmpi(ip->keyword->leaf_discipline, "none")){\r
- 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*/\r
- safe_run(str);\r
- }\r
- \r
- if (filter_type == 1){\r
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",tc, wan, ip->mark, ip->mark);\r
- safe_run(str);\r
+ if (strcmpi(ip->keyword->leaf_discipline, "none"))\r
+ {\r
+ 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*/\r
+ safe_run(str);\r
+ } \r
+ if (filter_type == 1)\r
+ {\r
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",tc, wan, ip->mark, ip->mark);\r
+ safe_run(str);\r
}\r
}\r
else\r
i++;\r
}\r
\r
-\r
if(idxs)\r
{\r
- chain_forward="forw_common";\r
- chain_postrouting="post_common";\r
+ chain_forward = "forw_common";\r
+ chain_postrouting = "post_common";\r
}\r
else\r
{\r
- chain_forward="FORWARD";\r
- chain_postrouting="POSTROUTING";\r
+ chain_forward = "FORWARD";\r
+ chain_postrouting = "POSTROUTING";\r
}\r
-\r
- /* -------------------------------------------------------- mark download */\r
-\r
- if(qos_proxy)\r
+ /* -------------------------------- classify or reject free download */\r
{\r
- 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);\r
- save_line(str);\r
- sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j ACCEPT",chain_postrouting,proxy_ip,proxy_port,lan);\r
- save_line(str);\r
+ char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */\r
+ if(free_min) final_chain = "ACCEPT";\r
+ if(qos_proxy)\r
+ {\r
+ if(free_min)\r
+ {\r
+ 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);\r
+ save_line(str);\r
+ }\r
+ sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s",chain_postrouting,proxy_ip,proxy_port,lan,final_chain);\r
+ save_line(str);\r
+ }\r
+ if(free_min)\r
+ {\r
+ sprintf(str,"-A %s -o %s -j %s%d",chain_postrouting,lan,mark_iptables,3);\r
+ save_line(str);\r
+ }\r
+ sprintf(str,"-A %s -o %s -j %s",chain_postrouting,lan,final_chain);\r
+ save_line(str);\r
+ /* ------------------------------- classify or reject free upload */\r
+ if(free_min)\r
+ {\r
+ sprintf(str,"-A %s -o %s -j %s%d",chain_forward,wan,mark_iptables,3);\r
+ save_line(str);\r
+ }\r
+ sprintf(str,"-A %s -o %s -j %s",chain_forward,wan,final_chain);\r
+ save_line(str);\r
}\r
- sprintf(str,"-A %s -o %s -j %s%d",chain_postrouting,lan,mark_iptables,3);\r
- save_line(str);\r
- sprintf(str,"-A %s -o %s -j ACCEPT",chain_postrouting,lan);\r
- save_line(str);\r
-\r
- /* -------------------------------------------------------- mark upload */\r
- sprintf(str,"-A %s -o %s -j %s%d",chain_forward,wan,mark_iptables,3);\r
- save_line(str);\r
- sprintf(str,"-A %s -o %s -j ACCEPT",chain_forward,wan);\r
- save_line(str);\r
-\r
- printf("Total IP count: %d\n", i);\r
-\r
- /*-----------------------------------------------------------------*/\r
- puts("Generating free bandwith classes ...");\r
- /*-----------------------------------------------------------------*/\r
\r
- /* ---------------------------------------- tc - free bandwith shared class */\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
- safe_run(str);\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,wan,parent,free_min,free_max,burst);\r
- safe_run(str);\r
+ if(free_min) /* allocate free bandwith if it is not zero... */ \r
+ {\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
+ 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
+ safe_run(str);\r
+ /* tc SFQ */\r
+ if (strcmpi(qos_leaf, "none"))\r
+ {\r
+ sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,lan,qos_leaf);\r
+ safe_run(str);\r
+ \r
+ sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,wan,qos_leaf);\r
+ safe_run(str);\r
+ } \r
+ /* tc handle 1 fw flowid */\r
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,lan);\r
+ safe_run(str);\r
\r
- /* tc SFQ */\r
- if (strcmpi(qos_leaf, "none")){\r
- sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,lan,qos_leaf);\r
- safe_run(str);\r
- \r
- sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,wan,qos_leaf);\r
- safe_run(str);\r
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,wan);\r
+ safe_run(str);\r
}\r
- \r
- /* tc handle 1 fw flowid */\r
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,lan);\r
- safe_run(str);\r
-\r
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,wan);\r
- safe_run(str);\r
-\r
- run_restore();\r
- \r
+ printf("Total IP count: %d\n", i);\r
+ run_restore(); \r
if (log_file) fclose(log_file);\r
return 0;\r
-\r
/* that's all folks, thank you for reading it all the way up to this point ;-) */\r
/* bad luck C<<1 is not yet finished, I promise no sprintf() next time... */\r
}\r
GIT.Harvie.CZ / svn / Prometheus-QoS / .git / blobdiff