X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=8c70bb0b86e7340f2feff6f13b3a1c47302fc75e;hp=0870bcec81a9239e117d95310c2b301c0022e77f;hb=1f13bb8e59cd4f0c1a7bdfcde5599e5c0188d6c2;hpb=e64e760d50046e48f3520045970878a4687a19e2 diff --git a/prometheus.c b/prometheus.c index 0870bce..8c70bb0 100644 --- a/prometheus.c +++ b/prometheus.c @@ -7,7 +7,7 @@ /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -/* Modified by: xChaos, 20120511 +/* Modified by: xChaos, 20120516 ludva, 20080415 Prometheus QoS is free software; you can redistribute it and/or @@ -33,21 +33,21 @@ #include "cll1-0.6.2.h" -const char *version = "0.8.3-c"; +const char *version = "0.8.3-d"; /* 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-2012 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 */ +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 */ @@ -55,8 +55,10 @@ char *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition 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 *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 */ +char *json = "/var/www/traffic.json"; /* hall of fame - 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) */ @@ -67,6 +69,7 @@ char *lms_url = "/lms/?m=customerinfo&id="; int use_jquery_popups = 1; int row_odd_even = 0; /* */ + const char *tr_odd_even(void) { row_odd_even = 1 - row_odd_even; @@ -424,7 +427,7 @@ void get_config(char *config_filename) 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); @@ -435,9 +438,11 @@ 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("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); @@ -474,7 +479,7 @@ void get_config(char *config_filename) done; printf("\n"); - /*leaf discipline for keywords*/ + /* leaf discipline for keywords */ for_each(keyword,keywords) { if(!strcmpi(keyword->leaf_discipline, "")) @@ -605,7 +610,7 @@ void get_traffic_statistics(void) { printf("(upload) "); } - printf("IP %s: %Lu M (%ld pkts)\n", ipaddr, traffic, pkts); + printf("IP %s: %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts); if_exists(ip,ips,eq(ip->addr,ipaddr)); else @@ -651,8 +656,7 @@ void get_traffic_statistics(void) } } } - - free(cmd); + free(cmd); } /* ========== This function executes, logs OR ALSO prints command ========== */ @@ -684,7 +688,7 @@ void run_restore(void) string(restor,STRLEN); /*-----------------------------------------------------------------*/ - printf("Running %s <%s ...\n",iptablesrestore,iptablesfile); + printf("Running %s <%s ...\n", iptablesrestore, iptablesfile); /*-----------------------------------------------------------------*/ save_line("COMMIT"); @@ -895,9 +899,9 @@ void parse_ip_log(int argc, char **argv) } } sprintf(str,"%s/%s-%s.html",html_log_dir,year,month); - printf("Writing %s ...",str); + printf("Writing %s ... ",str); f=fopen(str,"w"); - if(f) + if(f > 0) { fprintf(f, "\n\ \n\ @@ -913,13 +917,13 @@ void parse_ip_log(int argc, char **argv) if(iplog->traffic) { fprintf(f, "%s\n\ -\n\ +\n\ \ - \ - \ - \n", total, line); - fputs("
%s %s%d%s%s", tr_odd_even(), i++, log_url, iplog->name, iplog->name); if(iplog->lmsid > 0) { /*base URL will be configurable soon ... */ - fprintf(f, "%04d\n", lms_url, iplog->lmsid, iplog->lmsid); + fprintf(f, "%04d\n", lms_url, iplog->lmsid, iplog->lmsid); } else if(iplog->lmsid == 0) { @@ -934,11 +938,11 @@ void parse_ip_log(int argc, char **argv) iplog->l=total; } } - fprintf(f,"
Total:%ld GB%Ld kb/s
\n", f); + fprintf(f,"\ + Total:\ + %ld GB\ + %Ld kb/s\n", total, line); + fputs("\n", f); row_odd_even = 0; if(i>10) @@ -954,7 +958,11 @@ void parse_ip_log(int argc, char **argv) if_exists(iplog,iplogs,iplog->l>=total/4) { fprintf(f,"%sTop 25%% of traffic\n", tr_odd_even()); - fprintf(f,"%d%d %%%ld G%d %%\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + fprintf(f,"%d\n\ +%d %%\n\ +%ld GB\n\ +%d %%\n", + iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); } if_exists(iplog,iplogs,iplog->i==10) @@ -962,9 +970,9 @@ void parse_ip_log(int argc, char **argv) fprintf(f,"%sTop 10 downloaders\n", tr_odd_even()); fprintf(f,"10\n\ %d %%\n\ -%ld G\n\ +%ld GB\n\ %d %%\n", - (100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); } if_exists(iplog,iplogs,iplog->l>=total/2) @@ -972,7 +980,7 @@ void parse_ip_log(int argc, char **argv) fprintf(f,"%sTop 50%% of traffic\n", tr_odd_even()); fprintf(f,"%d\n\ %d %%\n\ -%ld G\n\ +%ld GB\n\ %d %%\n", iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); } @@ -982,9 +990,9 @@ void parse_ip_log(int argc, char **argv) fprintf(f,"%sTop 80%% of traffic\n",tr_odd_even()); fprintf(f,"%d\n\ %d %%\n\ -%ld G\n\ +%ld GB\n\ %d %%\n", - iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); } if_exists (iplog,iplogs,iplog->i>=i/5) @@ -992,15 +1000,19 @@ void parse_ip_log(int argc, char **argv) fprintf(f,"%sTop 20%% downloaders\n",tr_odd_even()); fprintf(f,"%d\n\ %d %%\n\ -%ld G\n\ +%ld GB\n\ %d %%\n", - iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); } if_exists(iplog,iplogs,iplog->i>=i/4) { fprintf(f,"%sTop 25%% downloaders\n", tr_odd_even()); - fprintf(f,"%d%d %%%ld G%d %%\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + fprintf(f,"%d\n\ +%d %%\n\ +%ld GB\n\ +%d %%\n", + iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); } if_exists(iplog,iplogs,iplog->i>=i/2) @@ -1008,30 +1020,62 @@ void parse_ip_log(int argc, char **argv) fprintf(f,"%sTop 50%% downloaders\n",tr_odd_even()); fprintf(f,"%d\n\ %d %%\n\ -%ld G%d %%\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); +%ld GB\n\ +%d %%\n", + iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); } if_exists(iplog,iplogs,iplog->i>=4*i/5) { fprintf(f,"%sTop 80%% downloaders\n",tr_odd_even()); - fprintf(f,"%d%d %%%ld G%d %%\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + fprintf(f,"%d\n\ +%d %%\n\ +%ld GB\n\ +%d %%\n", + iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); } - fprintf(f,"\n\ -All users, all traffic\n\ -%d\n\ + fprintf(f,"All users, all traffic\n", log_url); + fprintf(f,"%d\n\ 100 %%\n\ -%ld G\n\ +%ld GB\n\ 100 %%\n",i-1,total); fputs("\n", f); } fprintf(f, stats_html_signature, version); fclose(f); - puts(" done."); + puts("done."); + } + else + { + perror(str); } } +void append_log(struct IP *self) /*using global variables*/ +{ + char *d, *str; + FILE *f; + + date(d); /* this is typical cll1.h macro - prints current date */ + string(str,STRLEN); + sprintf(str,"%s/%s.log", log_dir, self->name); + f=fopen(str,"a"); + if(f > 0) + { + fprintf(f,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s", + time(NULL), self->name, self->traffic, self->direct, self->proxy, + self->upload, self->min, self->max, self->desired, self->lmsid, d); /* d = date*/ + fclose(f); + } + else + { + perror(str); + } +} + + /*-----------------------------------------------------------------*/ /* Are you looking for int main(int argc, char **argv) ? :-)) */ /*-----------------------------------------------------------------*/ @@ -1448,7 +1492,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); } @@ -1593,20 +1640,34 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); else if(!dry_run && !just_flush) { /*-----------------------------------------------------------------*/ - printf("Writing data transfer database ...\n"); + printf("Writing daily statistics %s ... ", json); /*-----------------------------------------------------------------*/ - f=fopen("/var/run/prometheus.previous","w"); - if(f) + f=fopen(json, "w"); + if(f > 0) { - for_each(ip,ips) + int jsoncount=0; + fprintf(f, "{\n"); + for_each(ip, ips) { - if(ip->traffic || ip->direct || ip->proxy || ip->upload) + if(jsoncount) { - fprintf(f,"%s %Lu %Lu %Lu %Lu\n", - ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload); + fprintf(f, ",\n"); } + if( ip->lmsid > 0 + && (ip->traffic || ip->direct || ip->proxy || ip->upload)) + { + fprintf(f, " %d:{ \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu }", + ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload); + } + jsoncount++; } + fprintf(f, "}\n"); fclose(f); + puts("done."); + } + else + { + perror(json); } f=fopen(html,"w"); ptr=html; @@ -1646,9 +1707,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); fprintf(f, "%d%d kb/s", group->count, group->desired); - for_each(keyword, keywords) + for_each(keyword, keywords) if(keyword->ip_count) { - fprintf(f,"%d Mb/s", + fprintf(f,"%d MB", keyword->html_color, group->min*keyword->data_limit); } i += group->desired; @@ -1664,7 +1725,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); Line %Ld kb/s",line); fprintf(f,"%d%d kb/s",total,i); - for_each(keyword, keywords) + for_each(keyword, keywords) if(keyword->ip_count) { fprintf(f,"%d IPs",keyword->ip_count); } @@ -1684,7 +1745,6 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); unsigned long long total_traffic=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0; int active_classes=0; int colspan=12; - FILE *iplog; struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums=NULL; int limit_count=0, prio_count=0; int popup_button=0; @@ -1748,7 +1808,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); #endif /* hostnames -------------------------------------- */ - fprintf(f,"%s%d%s\n", + fprintf(f,"%s%d%s\n", tr_odd_even(), ip->name, i, log_url, ip->name, ip->name); if(use_jquery_popups) @@ -1757,7 +1817,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); popup_button=0; for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing)) { - fprintf(f,"
%s\n", log_url, sharedip->name, sharedip->name); + fprintf(f,"
%s\n", log_url, sharedip->name, sharedip->name); popup_button++; } fputs("\n",f); @@ -1775,7 +1835,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); fputs("",f); if(ip->lmsid > 0) { - fprintf(f,"%04d\n", lms_url, ip->lmsid, ip->lmsid); + fprintf(f,"%04d\n", lms_url, ip->lmsid, ip->lmsid); } else if(ip->lmsid == 0) { @@ -1845,14 +1905,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); 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%d\t%s", - time(NULL), ip->name, ip->traffic, ip->direct, ip->proxy, - ip->upload, ip->min, ip->max, ip->desired, ip->lmsid, d); /* d = date*/ - fclose(iplog); + append_log(sharedip); } } } @@ -1883,7 +1939,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); if_exists(sum,sums,sum->l>=total_traffic/4) { fprintf(f,"%sTop 25%% of traffic\n", tr_odd_even()); - fprintf(f,"%d%d %%%Lu M%Ld %%\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); + fprintf(f,"%d\n\ +%d %%\n\ +%Lu MB\n\ +%Ld %%\n", + sum->i, (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic); } if_exists(sum,sums,sum->i==10) @@ -1893,7 +1953,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); %d %%\n\ %Lu MB\n\ %Ld %%\n", - (100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); + (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic); } if_exists(sum,sums,sum->l>=total_traffic/2) @@ -1960,16 +2020,17 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); } - fprintf(f,"All users, all traffic\n", log_url); + fprintf(f,"All users, all traffic\n", log_url); fprintf(f,"%d\n\ 100 %%\n\ -%Lu M\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) @@ -1979,6 +2040,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); active_classes, total_traffic, i, limit_count, prio_count, d); /* d = date*/ fclose(iplog); } + else + { + perror(str); + } } } @@ -1990,19 +2055,26 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); { puts("Statistics preview generated (-p switch) - now exiting ..."); exit(0); - } - - /*-----------------------------------------------------------------*/ - puts("Generating iptables and tc classes ..."); - /*-----------------------------------------------------------------*/ + } i=0; #ifdef DEBUG printf("%-22s %-15s mark\n","name","ip"); #endif - for_each(ip,ips) if(ip->mark>0) - { + printf("Writing %s ... ", classmap); + f = fopen(classmap, "w"); + if(f < 0) + { + perror(classmap); + } + + /*-----------------------------------------------------------------*/ + puts("Generating iptables and tc classes ... "); + /*-----------------------------------------------------------------*/ + + for_each(ip, ips) if(ip->mark > 0) + { if(idxs) { char *buf; @@ -2031,27 +2103,32 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /* -------------------------------------------------------- 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) @@ -2061,17 +2138,21 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); 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")) { - 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) { - 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); } @@ -2089,14 +2170,22 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); if(strcmpi(ip->keyword->leaf_discipline, "none")) { - sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s",tc, wan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/ + 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); + 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) + { + fprintf(f, "%s %d\n", ip->addr, ip->mark); + } } else { @@ -2106,7 +2195,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } i++; } - + if(f) + { + puts("done."); + fclose(f); + } + if(idxs) { chain_forward = "forw_common"; @@ -2120,31 +2214,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); } @@ -2154,25 +2253,25 @@ 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 %d", - tc,lan,parent,free_min,free_max,burst,lowest_priority); + 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 %d", - tc,wan,parent,free_min,free_max,burst,lowest_priority); + tc, wan, parent, free_min, free_max, burst, lowest_priority); safe_run(str); /* tc SFQ */ if(strcmpi(qos_leaf, "none")) { - sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,lan,qos_leaf); + sprintf(str,"%s qdisc add dev %s parent 1: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);