X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=8c70bb0b86e7340f2feff6f13b3a1c47302fc75e;hp=ba52a1ace851666aa1d026f87fa115ca764f2860;hb=1f13bb8e59cd4f0c1a7bdfcde5599e5c0188d6c2;hpb=103d292c3e392be70875c89e6959417c694ca56d diff --git a/prometheus.c b/prometheus.c index ba52a1a..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,101 +917,165 @@ void parse_ip_log(int argc, char **argv) if(iplog->traffic) { fprintf(f, "%s\n\ -\n\ +\n\ \n\ - \n\ - \n", + fprintf(f, "\n\ + \n\ + \n", iplog->traffic, iplog->traffic>>10, iplog->guaranted); total+=iplog->traffic>>10; iplog->i=i; iplog->l=total; } } - fprintf(f,"\ - \ - \ - \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) { fputs("-------",f); } - fprintf(f, "%ld M%ld G%ld kbps
%ld MB%ld GB%ld kb/s
Total:%ld GB%Ld kbps
\n", f); + fprintf(f,"\ + Total:\ + %ld GB\ + %Ld kb/s\n", total, line); + fputs("\n", f); row_odd_even = 0; if(i>10) { - fputs("

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

Enterprise Resource Planning (ERP)
Analytic categoryActive ClassesData transfers
\n\ +\n\ +\n\ +\n\ +\n\ +\n\ +\n",f); if_exists(iplog,iplogs,iplog->l>=total/4) { fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + fprintf(f,"\n\ +\n\ +\n\ +\n", + iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); } if_exists(iplog,iplogs,iplog->i==10) { fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n",(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + fprintf(f,"\n\ +\n\ +\n\ +\n", + (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); } if_exists(iplog,iplogs,iplog->l>=total/2) { fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + fprintf(f,"\n\ +\n\ +\n\ +\n", + iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); } if_exists(iplog,iplogs,iplog->l>=4*total/5) { fprintf(f,"%s\n",tr_odd_even()); - fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + fprintf(f,"\n\ +\n\ +\n\ +\n", + iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); } if_exists (iplog,iplogs,iplog->i>=i/5) { fprintf(f,"%s\n",tr_odd_even()); - fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + fprintf(f,"\n\ +\n\ +\n\ +\n", + 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,"%s\n", tr_odd_even()); - fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + fprintf(f,"\n\ +\n\ +\n\ +\n", + iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); } if_exists(iplog,iplogs,iplog->i>=i/2) { fprintf(f,"%s\n",tr_odd_even()); - fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + fprintf(f,"\n\ +\n\ +\n\ +\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,"%s\n",tr_odd_even()); - fprintf(f,"\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); + fprintf(f,"\n\ +\n\ +\n\ +\n", + iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); } - fprintf(f,"\n"); - fprintf(f,"\n",i-1,total); - fputs("
Enterprise Resource Planning (ERP)
Analytic categoryActive ClassesData transfers
Top 25%% of traffic%d%d %%%ld G%d %%
%d%d %%%ld GB%d %%
Top 10 downloaders10%d %%%ld G%d %%
10%d %%%ld GB%d %%
Top 50%% of traffic%d%d %%%ld G%d %%
%d%d %%%ld GB%d %%
Top 80%% of traffic%d%d %%%ld G%d %%
%d%d %%%ld GB%d %%
Top 20%% downloaders%d%d %%%ld G%d %%
%d%d %%%ld GB%d %%
Top 25%% downloaders%d%d %%%ld G%d %%
%d%d %%%ld GB%d %%
Top 50%% downloaders%d%d %%%ld G%d %%
%d%d %%%ld GB%d %%
Top 80%% downloaders%d%d %%%ld G%d %%
%d%d %%%ld GB%d %%
All users, all traffic%d100 %%%ld G100 %%
\n", f); + fprintf(f,"All users, all traffic\n", log_url); + fprintf(f,"%d\n\ +100 %%\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) ? :-)) */ /*-----------------------------------------------------------------*/ @@ -1147,7 +1215,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); ip->min = atoi(substring); if(ip->min <= 0) { - printf(" %s: Illegal value of minimum bandwidth 0 kbps, using %d kbps\n", + printf(" %s: Illegal value of minimum bandwidth 0 kbps, using %d kb/s\n", str, free_min); ip->min = free_min; } @@ -1424,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); } @@ -1569,22 +1640,35 @@ 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; } @@ -1602,8 +1686,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); { fprintf(f,"\n", jquery_url); } - fputs("\n\n\ -\n\ + fputs("
#
\n\ +\n\ +\n\ +\n\ \n\ \n\ \n",f); @@ -1614,16 +1700,16 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); 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, "%s", + fprintf(f, "%s", tr_odd_even(), count, group->min); - fprintf(f, "", + fprintf(f, "", group->count, group->desired); - for_each(keyword, keywords) + for_each(keyword, keywords) if(keyword->ip_count) { - fprintf(f,"", + fprintf(f,"", keyword->html_color, group->min*keyword->data_limit); } i += group->desired; @@ -1631,20 +1717,22 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); count++; } #ifdef DEBUG - printf("Total groups: %d Total bandwidth requested: %d k\nAGGREGATION: 1/%d\n", + printf("Total groups: %d Total bandwidth requested: %d kb/s\nAGGREGATION: 1/%d\n", count, i, i/line); #endif - fprintf(f,"\n\ +\n\ +",keyword->ip_count); } fprintf(f,"\n", (int)(0.5+i/line)); fprintf(f,"\n", keywordcount, total); - fputs("
Bandwidth classes
#groupIPsrequested%d%d k%d%d kb/s%d%d k%d%d kb/s%d M%d MB
Line %Ld k",line); - fprintf(f,"%d%d k",total,i); + fprintf(f,"
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
Aggregation 1/%d%d traffic classes
\n",f); + fputs("\n",f); } else if(!dry_run && !just_flush) { @@ -1656,8 +1744,7 @@ 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=11; - 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; @@ -1666,32 +1753,37 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); { colspan++; } - if(found_lmsid) - { - colspan++; - } - fprintf(f,"

\n", total_upload); + fprintf(f,"\n
%s",title); + fprintf(f,"

\n\n", d); - fputs("",f); - if(found_lmsid) - { - fputs("\n",f); - } - fputs("\ -\ -\ -\n",f); + fputs("\n\n",f); + fputs("\n\ +\n\ +\n\ +\n",f); if(qos_proxy) { fputs("\n",f); } - fputs("\ -\ -\ -\ -\n\ -\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) @@ -1716,15 +1808,16 @@ 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\n",f); } - fprintf(f,"\n", ip->credit); - fprintf(f,"", + 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", ip->proxy); + fprintf(f,"\n", ip->proxy); } /* upload ---------------------------------------- */ - fprintf(f,"\n",f); /* ----------------------------------------------- */ - fprintf(f,"\n", - ip->min,ip->desired,f1,ip->max,f2,f1,ip->prio,f2); + 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; @@ -1808,25 +1905,22 @@ 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); } } } - fprintf(f,"", colspan-7, i); - fprintf(f,"\n", total_traffic, 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,"\n", total_proxy); } - fprintf(f,"", total_upload); - fprintf(f,"\n
%s",title); fprintf(f," (%s)
#hostnamelmscreditlimittotaldirect
 creditFUPtotaldownproxyuploadminimumdesiredmaximumprio
upminmaxlimit 
#hostname [+sharing]LMSMBMBMBMBMBkb/skb/skb/sprio
%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) { 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); + fprintf(f,"
%s\n", log_url, sharedip->name, sharedip->name); popup_button++; } fputs("\n",f); @@ -1742,8 +1835,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); fputs("		",f); if(ip->lmsid > 0) { - /*base URL will be configurable soon ... */ - 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) { @@ -1751,20 +1843,20 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } fputs("%Lu M%Lu M%Lu%Lu%s%Lu M%s", f1, ip->traffic, f2); + fprintf(f,"%s%Lu%s", f1, ip->traffic, f2); /* download --------------------------------------- */ - fprintf(f,"%Lu M", ip->direct); + fprintf(f,"%Lu", ip->direct); if(use_jquery_popups) { fprintf(f,"",i); for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing)) { - fprintf(f,"
%Lu M", sharedip->direct); + fprintf(f,"
%Lu", sharedip->direct); } fputs("\n",f); } @@ -1773,24 +1865,29 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); if(qos_proxy) { - fprintf(f,"		%Lu M%Lu%Lu M", ip->upload); + fprintf(f,"%Lu", ip->upload); if(use_jquery_popups) { fprintf(f,"",i); for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing)) { - fprintf(f,"
%Lu M", sharedip->upload); + fprintf(f,"
%Lu", sharedip->upload); } fputs("\n",f); } fputs("		%d k%d k%s%d k%s%s%d%s
%d%d%s%d%s%s%d%s
%d CLASSES%Lu M%Lu M
%d CLASSES%Lu%Lu%Lu M%Lu%Lu MFUP-LIMIT %dx LOW-PRIO %dx
\n",limit_count,prio_count); + fprintf(f,"

%LuLIMIT %dx LOW-PRIO %dx
\n",limit_count,prio_count); row_odd_even = 0; if(active_classes>10) @@ -1835,32 +1929,51 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); long long top20_perc2=0; unsigned long long top20_sum=0l; - fputs("

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

Enterprise Resource 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,"%s\n", tr_odd_even()); - fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); + fprintf(f,"\n\ +\n\ +\n\ +\n", + sum->i, (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic); } if_exists(sum,sums,sum->i==10) { fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n",(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); + fprintf(f,"\n\ +\n\ +\n\ +\n", + (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic); } if_exists(sum,sums,sum->l>=total_traffic/2) { fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); + fprintf(f,"\n\ +\n\ +\n\ +\n", + sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); } if_exists(sum,sums,sum->l>=4*total_traffic/5) { fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); + fprintf(f,"\n\ +\n\ +\n\ +\n", + sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); } if_exists(sum,sums,sum->i>=(active_classes+1)/5) @@ -1870,37 +1983,54 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); top20_perc1=(100*sum->i+50)/active_classes; top20_sum=sum->l; top20_perc2=(100*sum->l+50)/total_traffic; - fprintf(f,"\n",top20_count,top20_perc1,top20_sum,top20_perc2); + fprintf(f,"\n\ +\n\ +\n\ +\n", + top20_count,top20_perc1,top20_sum,top20_perc2); } if_exists(sum,sums,sum->i>=(active_classes+1)/4) { fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); + fprintf(f,"\n\ +\n\ +\n\ +\n", + sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); } if_exists(sum,sums,sum->i>=(active_classes+1)/2) { fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); + fprintf(f,"\n\ +\n\ +\n\ +\n", + sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); } if_exists(sum,sums,sum->i>=4*(active_classes+1)/5) { fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic); + 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", log_url); + fprintf(f,"\n", log_url); fprintf(f,"\n\ \n\ -\n\ +\n\ \n",active_classes,total_traffic); - fputs("
Enterprise Resource Planning (ERP)
Analytic categoryActive ClassesData transfers
Top 25%% of traffic%d%d %%%Lu M%Ld %%
%d%d %%%Lu MB%Ld %%
Top 10 downloaders10%d %%%Lu M%Ld %%
10%d %%%Lu MB%Ld %%
Top 50%% of traffic%d%d %%%Lu M%Ld %%
%d%d %%%Lu MB%Ld %%
Top 80%% of traffic%d%d %%%Lu M%Ld %%
%d%d %%%Lu MB%Ld %%
%d%d %%%Lu M%Ld %%
%d%d %%%Lu MB%Ld %%
Top 25%% downloaders%d%d %%%Lu M%Ld %%
%d%d %%%Lu MB%Ld %%
Top 50%% downloaders%d%d %%%Lu M%Ld %%
%d%d %%%Lu MB%Ld %%
Top 80%% downloaders%d%d %%%Lu M%Ld %%
%d%d %%%Lu MB%Ld %%
All users, all traffic
All users, all traffic%d100 %%%Lu M%Lu MB100 %%
\n", f); + 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) @@ -1910,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); + } } } @@ -1921,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; @@ -1962,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) @@ -1992,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); } @@ -2020,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 { @@ -2037,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"; @@ -2051,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); } @@ -2085,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);