X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=3793a2ae79bb9240109d3a41d5c708ab5dbc622c;hp=013f7f20d63a01c4b3efef2a6babca4aa49a0584;hb=493e1ccd36ad4f318fd9abb6bad398f7e055a4b8;hpb=43cde5c3b21d9575669722e90143f93166c14140 diff --git a/prometheus.c b/prometheus.c index 013f7f2..3793a2a 100644 --- a/prometheus.c +++ b/prometheus.c @@ -7,8 +7,8 @@ /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -/* Modified: xChaos, 20080504 - ludva, 20080415 +/* Modified by: xChaos, 20080728 + 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 @@ -33,7 +33,7 @@ #include "cll1-0.6.h" -const char *version = "0.7.9-c"; +const char *version = "0.8.1-a"; /* Version numbers: 0.7.9 is development releases ("beta"), 0.8.0 will be "stable" */ /* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */ @@ -684,72 +684,75 @@ void parse_ip_log(int argc, char **argv) } printf("Analysing traffic for %s %s ...\n",month,year); - sprintf(str,"%s %s/*.log",ls,log_dir); + /* sorry... next release of C<<1 header file will include for_path_files(name,path) { } macro */ + sprintf(str,"%s %s/",ls,log_dir); shell(str); - - input(str,STRLEN) + 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) + if(strstr(str,".log")) { - 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) + 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*/ { - case 2: if(any_month || eq(ptr2,month)) m_ok = 1; break; - case 5: if(eq(ptr2,year)) y_ok = 1; break; + 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; + 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."); + 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); + fprintf(f,"
Data transfers - %s %sMin.speed
\n ",month,year); every(iplog,iplogs) if(iplog->traffic) { - fprintf(f,"\n", + fprintf(f,"\n", i++, iplog->name, iplog->traffic, iplog->traffic>>10, iplog->guaranted); total+=iplog->traffic>>10; } @@ -763,7 +766,7 @@ void parse_ip_log(int argc, char **argv) /*-----------------------------------------------------------------*/ -/* Are you looking for int main (int argc, char **argv) ? :-)) */ +/* Are you looking for int main(int argc, char **argv) ? :-)) */ /*-----------------------------------------------------------------*/ program @@ -1545,14 +1548,15 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); 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")){ - sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, lan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/ - safe_run(str); - } - - if (filter_type == 1){ - sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, lan, ip->mark, ip->mark); - safe_run(str); + if (strcmpi(ip->keyword->leaf_discipline, "none")) + { + sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, lan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/ + safe_run(str); + } + if (filter_type == 1) + { + sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, lan, ip->mark, ip->mark); + safe_run(str); } /* -------------------------------------------------------- upload class */ @@ -1565,14 +1569,15 @@ 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")){ - sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s",tc, wan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/ - safe_run(str); - } - - if (filter_type == 1){ - sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",tc, wan, ip->mark, ip->mark); - safe_run(str); + if (strcmpi(ip->keyword->leaf_discipline, "none")) + { + sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s",tc, wan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/ + safe_run(str); + } + if (filter_type == 1) + { + sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",tc, wan, ip->mark, ip->mark); + safe_run(str); } } else @@ -1580,72 +1585,76 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); i++; } - if(idxs) { - chain_forward="forw_common"; - chain_postrouting="post_common"; + chain_forward = "forw_common"; + chain_postrouting = "post_common"; } else { - chain_forward="FORWARD"; - chain_postrouting="POSTROUTING"; + chain_forward = "FORWARD"; + chain_postrouting = "POSTROUTING"; } - - /* -------------------------------------------------------- mark download */ - - if(qos_proxy) + /* -------------------------------- classify or reject free download */ { - 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 ACCEPT",chain_postrouting,proxy_ip,proxy_port,lan); - save_line(str); + char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */ + if(free_min) final_chain = "ACCEPT"; + if(qos_proxy) + { + if(free_min) + { + sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s%d",chain_postrouting,proxy_ip,proxy_port,lan,mark_iptables,3); + save_line(str); + } + sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s",chain_postrouting,proxy_ip,proxy_port,lan,final_chain); + save_line(str); + } + if(free_min) + { + sprintf(str,"-A %s -o %s -j %s%d",chain_postrouting,lan,mark_iptables,3); + save_line(str); + } + sprintf(str,"-A %s -o %s -j %s",chain_postrouting,lan,final_chain); + save_line(str); + /* ------------------------------- classify or reject free upload */ + if(free_min) + { + sprintf(str,"-A %s -o %s -j %s%d",chain_forward,wan,mark_iptables,3); + save_line(str); + } + sprintf(str,"-A %s -o %s -j %s",chain_forward,wan,final_chain); + save_line(str); } - 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 ACCEPT",chain_postrouting,lan); - save_line(str); - - /* -------------------------------------------------------- mark upload */ - 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 ACCEPT",chain_forward,wan); - save_line(str); - - printf("Total IP count: %d\n", i); - - /*-----------------------------------------------------------------*/ - puts("Generating free bandwith classes ..."); - /*-----------------------------------------------------------------*/ - /* ---------------------------------------- tc - free bandwith shared class */ - 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); - 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); - safe_run(str); + if(free_min) /* allocate free bandwith if it is not zero... */ + { + /*-----------------------------------------------------------------*/ + 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); + 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); + safe_run(str); + /* tc SFQ */ + if (strcmpi(qos_leaf, "none")) + { + sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,lan,qos_leaf); + safe_run(str); + + 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); + safe_run(str); - /* tc SFQ */ - if (strcmpi(qos_leaf, "none")){ - sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,lan,qos_leaf); - safe_run(str); - - sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,wan,qos_leaf); - safe_run(str); + sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,wan); + 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); - safe_run(str); - - sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,wan); - safe_run(str); - - run_restore(); - + printf("Total IP count: %d\n", i); + run_restore(); 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... */ }
%s %sData transfersMin.speed
%d%s%ld MB%ld GB%ld kbps
%d%s%ld MB%ld GB%ld kbps