/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */\r
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
\r
-/* Modified by: xChaos, 20110428\r
+/* Modified by: xChaos, 20120516\r
ludva, 20080415\r
\r
Prometheus QoS is free software; you can redistribute it and/or\r
\r
#include "cll1-0.6.2.h"\r
\r
-const char *version = "0.8.3"; \r
+const char *version = "0.8.3-d";\r
\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
\r
-const char *stats_html_signature = "<small>Statistics generated by Prometheus QoS version %s<br>GPL+Copyright(C)2005-2011 Michael Polak, <a href=\"http://www.arachne.cz/\">Arachne Labs</a></small>\n";\r
+const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2012 Michael Polak, <a href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";\r
\r
/* ======= All path names are defined here (for RPM patch) ======= */\r
\r
-char *tc = "/sbin/tc"; /* requires tc with HTB support */\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
+const char *tc = "/sbin/tc"; /* requires tc with HTB support */\r
+const char *iptables = "/sbin/iptables"; /* requires iptables utility */\r
+const char *iptablessave = "/sbin/iptables-save"; /* not yet required */\r
+const char *iptablesrestore = "/sbin/iptables-restore"; /* requires iptables-restore */\r
const char *ls = "/bin/ls"; /* this is not user configurable :-) */\r
\r
char *config = "/etc/prometheus/prometheus.conf"; /* main configuration file */\r
\r
char *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/\r
char *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */\r
-char *html = "/var/www/traffic.html"; /* hall of fame filename */\r
+char *classmap = "/var/lib/misc/prometheus.classes"; /* credit log file */\r
+char *html = "/var/www/traffic.html"; /* hall of fame - html version */\r
char *preview = "/var/www/preview.html"; /* hall of fame preview */\r
+char *json = "/var/www/traffic.json"; /* hall of fame - json version */\r
char *cmdlog = "/var/log/prometheuslog"; /* command log filename */\r
char *log_dir = "/var/www/logs/"; /* log directory pathname, ended with slash */\r
-char *log_url = "logs/"; /* log directory relative URI prefix (partial URL) */\r
+char *log_url = "/logs/"; /* log directory relative URI prefix (partial URL) */\r
char *html_log_dir = "/var/www/logs/html/";\r
\r
+char *jquery_url = "http://code.jquery.com/jquery-latest.js";\r
+char *lms_url = "/lms/?m=customerinfo&id=";\r
+int use_jquery_popups = 1;\r
+int row_odd_even = 0; /*<tr class="odd/even"> */\r
+\r
+\r
+const char *tr_odd_even(void)\r
+{\r
+ row_odd_even = 1 - row_odd_even;\r
+ if(row_odd_even)\r
+ {\r
+ return "<tr class=\"even\">\n";\r
+ }\r
+ else\r
+ {\r
+ return "<tr class=\"odd\">\n";\r
+ }\r
+}\r
+\r
/* ======= Help screen is hopefuly self-documenting part of code :-) ======= */\r
\r
void help(void)\r
char *very_ugly_ipv4_code(char *inip,int bitmask,int format_as_chainname)\r
{\r
/* warning: this function was debugged only for bitmask values 20,24,28 !!!*/\r
- int dot=0,n;\r
+ int dot=0, n;\r
char *ip,*outip,*outptr,*fmt;\r
\r
duplicate(inip,ip);\r
}\r
else\r
{\r
- char *cutdot=strchr(ip+1,'.'); /*for bitmask<24*/\r
- if(cutdot)*cutdot='\0';\r
+ char *cutdot=strchr(ip+1,'.'); /*for bitmask<24*/ \r
+ if(cutdot)\r
+ {\r
+ *cutdot = '\0';\r
+ }\r
+ \r
if(format_as_chainname)\r
- fmt="_%d_%d";\r
+ {\r
+ fmt = "_%d_%d";\r
+ }\r
else\r
- fmt=".%d";\r
+ {\r
+ fmt = ".%d";\r
+ }\r
+ \r
if(bitmask%8)\r
- n=atoi(ip+1)-atoi(ip+1)%(1<<(8-bitmask%8));\r
+ {\r
+ n = atoi(ip+1)-atoi(ip+1)%(1<<(8-bitmask%8));\r
+ }\r
else\r
- n=0;\r
+ {\r
+ n = 0;\r
+ }\r
\r
/*debug printf("%d/%d => [_%d_%d]\n",atoi(ip+1),bitmask,n,bitmask); */\r
sprintf(outptr,fmt,n,bitmask);\r
- if(!format_as_chainname) while(bitmask<24)\r
+ if(!format_as_chainname)\r
{\r
- strcat(outip,".0");\r
- bitmask+=8;\r
+ while(bitmask<24)\r
+ {\r
+ strcat(outip,".0");\r
+ bitmask+=8;\r
+ }\r
}\r
/* debug printf("[%s]\n",outip); */\r
return outip;\r
option("iptables",iptables);\r
option("iptables-save",iptablessave); /* new */\r
option("iptables-restore",iptablesrestore); /* new */\r
- option("iptables-file",iptablesfile); /* new */\r
+ option("iptables-in-filename",iptablesfile); /* new */\r
option("hosts",hosts);\r
option("lan-interface",lan);\r
option("wan-interface",wan);\r
ioption("hall-of-fame-enable",hall_of_fame);\r
option("hall-of-fame-title",title);\r
option("hall-of-fame-filename",html);\r
+ option("json-filename",json);\r
option("hall-of-fame-preview",preview);\r
option("log-filename",cmdlog);\r
option("credit-filename",credit);\r
+ option("classmap-filename",classmap);\r
ioption("credit-enable",enable_credit);\r
option("log-traffic-directory",log_dir);\r
option("log-traffic-html-directory",html_log_dir);\r
option("log-traffic-url-path",log_url);\r
+ option("jquery-url",jquery_url);\r
+ option("lms-url",lms_url);\r
+ ioption("use-jquery-popups",use_jquery_popups);\r
option("qos-free-zone",qos_free_zone);\r
ioption("qos-free-delay",qos_free_delay);\r
ioption("qos-proxy-enable",qos_proxy);\r
ioption("htb-r2q",htb_r2q);\r
ioption("magic-include-upload",include_upload);\r
ioption("magic-treshold",magic_treshold); \r
- option("filter-type", cnf);\r
- \r
+ option("filter-type", cnf); \r
/* not yet implemented:\r
ioption("magic-fixed-packets",fixed_packets);\r
ioption("magic-relative-packets",packet_limit);\r
done;\r
printf("\n");\r
\r
- /*leaf discipline for keywords*/\r
+ /* leaf discipline for 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
\r
- if (strcmpi(cnf, "mark"))\r
+ if(strcmpi(cnf, "mark"))\r
{\r
filter_type = 2;\r
mark = "CLASSIFY";\r
if(valid) switch(col)\r
{ \r
case 1: if(eq(ptr,"Chain"))\r
+ {\r
setchainname=1;\r
+ }\r
else if(eq(ptr,"pkts")) \r
+ {\r
valid=0;\r
+ }\r
else\r
+ {\r
sscanf(ptr,"%lu",&pkts); \r
+ }\r
break;\r
case 2: if(setchainname)\r
{\r
if(!strncmp(ptr,"post_",5) || eq(ptr,"POSTROUTING"))\r
- downloadflag=1; \r
+ {\r
+ downloadflag = 1; \r
+ }\r
else \r
- if(!strncmp(ptr,"forw_",5) || eq(ptr,"FORWARD"))\r
- downloadflag=0;\r
- \r
+ {\r
+ if(!strncmp(ptr,"forw_",5) || eq(ptr,"FORWARD"))\r
+ {\r
+ downloadflag = 0;\r
+ }\r
+ } \r
if(eq(ptr,"post_common") || eq(ptr,"forw_common"))\r
- commonflag=1;\r
+ {\r
+ commonflag = 1;\r
+ }\r
}\r
else\r
- sscanf(ptr,"%Lu",&traffic); traffic+=(1<<19); traffic>>=20;\r
+ {\r
+ sscanf(ptr,"%Lu",&traffic); \r
+ traffic += (1<<19);\r
+ traffic >>= 20;\r
+ }\r
break;\r
case 3: if((strncmp(ptr,"post_",5) && strncmp(ptr,"forw_",5)) || commonflag)\r
+ {\r
accept=eq(ptr,mark);\r
- /*if (filter_type==1) accept=eq(ptr,"MARK"); else accept=eq(ptr,"CLASSIFY");*/\r
+ }\r
+ /*if(filter_type==1) accept=eq(ptr,"MARK"); else accept=eq(ptr,"CLASSIFY");*/\r
break;\r
case 8: if(downloadflag)\r
{ \r
- if(strstr(proxy_ip,ptr))proxyflag=1; \r
+ if(strstr(proxy_ip,ptr))\r
+ {\r
+ proxyflag=1; \r
+ }\r
}\r
else\r
+ {\r
ipaddr=ptr; \r
- break;\r
+ }\r
+ break;\r
case 9: if(downloadflag)ipaddr=ptr;break;\r
}\r
\r
case 8:\r
case 9:\r
case 10:\r
- case 11: if (isalpha(*ptr)) /* character, not numeric string = date, just one*/\r
+ case 11: if(isalpha(*ptr)) /* character, not numeric string = date, just one*/\r
{\r
valid_columns(ptr2,ptr,' ',col2) switch(col2)\r
{\r
}\r
}\r
sprintf(str,"%s/%s-%s.html",html_log_dir,year,month);\r
- printf("Writing %s ...",str);\r
+ printf("Writing %s ... ",str);\r
f=fopen(str,"w");\r
- if(f)\r
+ if(f > 0)\r
{\r
- fprintf(f,"<table border><tr><th colspan=\"2\">%s %s</th><th align=\"right\">lms</th><th colspan=\"2\">Data transfers</th><th align=\"right\">Min.speed</th></tr>\n ",month,year);\r
-\r
- for_each(iplog,iplogs)\r
+ fprintf(f, "<table class=\"decorated last\"><thead>\n\\r
+<tr><th colspan=\"2\">%s %s</th>\n\\r
+<th style=\"text-align: right\">lms</th>\n\\r
+<th colspan=\"2\">Data transfers</th>\n\\r
+<th style=\"text-align: right\">Min.speed</th>\n\\r
+</tr></thead><tbody>\n ",\r
+ month, year);\r
+\r
+ row_odd_even = 0;\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\">", i++, iplog->name); \r
+ fprintf(f, "%s<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: left\"><a class=\"blue\" href=\"%s%s.log\">%s</td>\n\\r
+<td style=\"text-align: right\">", \r
+ tr_odd_even(), i++, log_url, iplog->name, iplog->name); \r
if(iplog->lmsid > 0)\r
{\r
/*base URL will be configurable soon ... */\r
- fprintf(f,"<a href=\"https://hermes.spoje.net/?m=customerinfo&id=%d\">%04d</a>\n", iplog->lmsid, iplog->lmsid);\r
+ fprintf(f, "<a class=\"blue\" href=\"%s%d\">%04d</a>\n", lms_url, iplog->lmsid, iplog->lmsid);\r
}\r
else if(iplog->lmsid == 0)\r
{\r
fputs("-------",f);\r
} \r
- fprintf(f,"<td align=\"right\">%ld M</td><th align=\"right\">%ld G</th><td align=\"right\">%ld kbps</th></tr>\n",\r
- iplog->traffic, iplog->traffic>>10, iplog->guaranted);\r
+ fprintf(f, "<td style=\"text-align: right\">%ld MB</td>\n\\r
+ <td style=\"text-align: right\"><strong>%ld GB</strong></td>\n\\r
+ <td style=\"text-align: right\">%ld kb/s</th></tr>\n",\r
+ 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=\"4\" 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
+ fprintf(f,"</tbody><thead><tr>\\r
+ <td colspan=\"4\" style=\"text-align: left\">Total:</td>\\r
+ <td style=\"text-align: right\"><strong>%ld GB</strong></td>\\r
+ <td style=\"text-align: right\"><strong>%Ld kb/s</strong></td></tr>\n", total, line);\r
+ fputs("</thead></table>\n", f);\r
\r
+ row_odd_even = 0;\r
if(i>10)\r
{\r
- fputs("<a name=\"erp\"></a><p><table border><tr><th colspan=\"5\">Enterprise Resource 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
+ fputs("<a name=\"erp\"></a><p><table class=\"decorated last\">\n\\r
+<caption>Enterprise Resource Planning (ERP)</caption>\n\\r
+<thead><tr>\n\\r
+<th>Analytic category</th>\n\\r
+<th colspan=\"2\" style=\"text-align: center\">Active Classes</th>\n\\r
+<th colspan=\"2\" style=\"text-align: center\">Data transfers</th>\n\\r
+</tr></thead><tbody>\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
+ fprintf(f,"%s<td>Top 25%% of traffic</td>\n", tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d %%</td><td style=\"text-align: right\">%ld G</td><td style=\"text-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
+ fprintf(f,"%s<td>Top 10 downloaders</td>\n", tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\"><strong>10</strong></td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%ld G</td>\n\\r
+<td style=\"text-align: right\">%d %%</td></tr>\n",\r
+ (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
+ fprintf(f,"%s<td>Top 50%% of traffic</td>\n", tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%ld G</td>\n\\r
+<td style=\"text-align: right\"><strong>%d %%</strong></td></tr>\n",\r
+ 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
+ fprintf(f,"%s<td>Top 80%% of traffic</td>\n",tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%ld G</td>\n\\r
+<td style=\"text-align: right\"><strong>%d %%</strong></td></tr>\n",\r
+ 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
+ fprintf(f,"%s<td>Top 20%% downloaders</td>\n",tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r
+<td style=\"text-align: right\">%ld G</td>\n\\r
+<td style=\"text-align: right\">%d %%</td></tr>\n",\r
+ 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
+ fprintf(f,"%s<td>Top 25%% downloaders</td>\n", tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d %%</td><td style=\"text-align: right\">%ld G</td><td style=\"text-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
+ fprintf(f,"%s<td>Top 50%% downloaders</td>\n",tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r
+<td style=\"text-align: right\">%ld G</td><td style=\"text-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
+ fprintf(f,"%s<td>Top 80%% downloaders</td>\n",tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d %%</td><td style=\"text-align: right\">%ld G</td><td style=\"text-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
+ fprintf(f,"</tbody><thead><tr>\n\\r
+<th>All users, all traffic</th>\n\\r
+<th style=\"text-align: right\">%d</th>\n\\r
+<th style=\"text-align: right\">100 %%</th>\n\\r
+<th style=\"text-align: right\">%ld G</th>\n\\r
+<th style=\"text-align: right\">100 %%</th></tr>\n",i-1,total);\r
+ fputs("</thead></table>\n", f);\r
}\r
\r
fprintf(f, stats_html_signature, version);\r
fclose(f);\r
- puts(" done.");\r
+ puts("done.");\r
+ }\r
+ else\r
+ {\r
+ perror(str);\r
+ }\r
+}\r
+\r
+void append_log(struct IP *self) /*using global variables*/\r
+{\r
+ char *d, *str;\r
+ FILE *f; \r
+\r
+ date(d); /* this is typical cll1.h macro - prints current date */ \r
+ string(str,STRLEN); \r
+ sprintf(str,"%s/%s.log", log_dir, self->name);\r
+ f=fopen(str,"a");\r
+ if(f > 0)\r
+ {\r
+ fprintf(f,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",\r
+ time(NULL), self->name, self->traffic, self->direct, self->proxy,\r
+ self->upload, self->min, self->max, self->desired, self->lmsid, d); /* d = date*/\r
+ fclose(f);\r
+ }\r
+ else\r
+ {\r
+ perror(str);\r
}\r
}\r
\r
+\r
/*-----------------------------------------------------------------*/\r
/* Are you looking for int main(int argc, char **argv) ? :-)) */\r
/*-----------------------------------------------------------------*/\r
int just_preview=FALSE; /* preview - generate just stats */\r
int just_logs=FALSE; /* just parse logs */\r
int run=FALSE;\r
+ int total=0;\r
\r
char *chain_forward, *chain_postrouting;\r
char *althosts=NULL;\r
\r
printf("\n\\r
Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\\r
-Version %s - Copyright (C)2005-2011 Michael Polak (xChaos)\n\\r
+Version %s - Copyright (C)2005-2012 Michael Polak (xChaos)\n\\r
iptables-restore & burst tunning & classify modification by Ludva\n\\r
Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);\r
\r
if(*ptr=='-')\r
{\r
*ptr=0;\r
- ip->max=ip->desired=atoi(ptr+1);\r
+ ip->max = ip->desired=atoi(ptr+1);\r
}\r
- ip->min=atoi(substring);\r
- if(ip->min<=0)\r
+ ip->min = atoi(substring);\r
+ if(ip->min <= 0)\r
{\r
- printf(" %s: Illegal value of minimum bandwidth 0 kbps, using %d kbps\n",str,free_min);\r
- ip->min=free_min;\r
+ printf(" %s: Illegal value of minimum bandwidth 0 kbps, using %d kb/s\n",\r
+ str, free_min);\r
+ ip->min = free_min;\r
}\r
- if(ip->max<=ip->min)\r
+ if(ip->max <= ip->min)\r
{\r
- ip->fixedprio=1;\r
- ip->max=ip->min+ip->keyword->reserve_min;\r
+ ip->fixedprio = 1;\r
+ ip->max = ip->min+ip->keyword->reserve_min;\r
}\r
else \r
{\r
- ip->max-=ip->keyword->reserve_max;\r
+ ip->max -= ip->keyword->reserve_max;\r
if(ip->max<ip->min)\r
{\r
ip->max=ip->min;\r
if_exists(group,groups,group->min==ip->min) \r
{ \r
group->count++; \r
- group->desired+=ip->min;\r
+ group->desired += ip->min;\r
ip->group = group->id; \r
}\r
else\r
{\r
create(group,Group);\r
- group->min=ip->min;\r
+ group->min = ip->min;\r
group->id = groupidx++;\r
ip->group = group->id;\r
\r
/*-----------------------------------------------------------------*/\r
puts("Resolving shared connections ...");\r
/*-----------------------------------------------------------------*/\r
- for_selected(ip,ips,ip->sharing)\r
+ for_each(ip,ips) if(ip->sharing)\r
{\r
- for_selected(sharedip,ips,eq(sharedip->name,ip->sharing))\r
+ for_each(sharedip,ips) if(eq(sharedip->name,ip->sharing))\r
{\r
sharedip->traffic+=ip->traffic;\r
ip->traffic=0;\r
}\r
if(!sharedip)\r
{\r
- printf("Unresolved shared connection: %s %s sharing-%s\n",ip->addr,ip->name,ip->sharing);\r
+ printf("Unresolved shared connection: %s %s sharing-%s\n",\r
+ ip->addr, ip->name, ip->sharing);\r
}\r
}\r
\r
/*-----------------------------------------------------------------*/\r
\r
iptables_file=fopen(iptablesfile,"w");\r
- if (iptables_file == NULL)\r
+ if(iptables_file == NULL)\r
{\r
puts("Cannot open iptablesfile!");\r
exit(-1);\r
}\r
\r
log_file=fopen(cmdlog,"w");\r
- if (log_file == NULL) \r
+ if(log_file == NULL) \r
{\r
puts("Cannot open logfile!");\r
exit(-1);\r
save_line(":post_common - [0:0]");\r
save_line(":forw_common - [0:0]");\r
\r
- for_selected(ip,ips,ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0"))\r
+ for_each(ip,ips) if(ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0"))\r
{\r
buf=hash_id(ip->addr,bitmask);\r
if_exists(idx,idxs,eq(idx->id,buf))\r
bitmask-=idxtable_bitmask2;\r
idxcount=0;\r
\r
- for_selected(idx,idxs,idx->parent==NULL)\r
+ for_each(idx,idxs) if(idx->parent == NULL)\r
{\r
buf=hash_id(idx->addr,bitmask);\r
if_exists(metaindex,idxs,eq(metaindex->id,buf))\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
+ printf("%d: %s/%d\n",\r
+ ++i, subnet, idx->bitmask);\r
\r
sprintf(str,":post_%s - [0:0]", idx->id);\r
save_line(str);\r
if(just_flush)\r
{\r
fclose(iptables_file);\r
- if (log_file) fclose(log_file);\r
+ if(log_file)\r
+ { \r
+ fclose(log_file);\r
+ }\r
puts("Just flushed iptables and tc classes - now exiting ...");\r
exit(0);\r
}\r
sleep(qos_free_delay);\r
}\r
\r
- sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",tc,lan,htb_r2q);\r
+ sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",\r
+ 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 %d",\r
/*-----------------------------------------------------------------*/\r
/* sub-scope - local variables */ \r
{\r
- long long int rate=line;\r
- long long int max=line;\r
- int group_count=0;\r
- FILE *credit_file=NULL;\r
+ long long int rate = line;\r
+ long long int max = line;\r
+ int group_count = 0;\r
+ FILE *credit_file = NULL;\r
\r
if(!just_preview && !dry_run && enable_credit)\r
{\r
- credit_file=fopen(credit,"w");\r
+ credit_file = fopen(credit,"w");\r
}\r
\r
for_each(group,groups)\r
safe_run(str);\r
}\r
\r
- if(group_count++<max_nesting)\r
+ if(group_count++ < max_nesting)\r
{\r
- parent=group->id;\r
+ parent = group->id;\r
}\r
\r
- rate-=digital_divide*group->min;\r
- if(rate<group->min)\r
+ rate -= digital_divide*group->min;\r
+ if(rate < group->min)\r
{\r
- rate=group->min;\r
+ rate = group->min;\r
}\r
\r
/*shaping of aggresive downloaders, with credit file support */\r
if(use_credit)\r
{\r
- int group_rate=group->min, priority_sequence=lowest_priority;\r
+ int group_rate = group->min, priority_sequence = lowest_priority;\r
\r
- for_selected(ip, ips, ip->min==group->min && ip->max>ip->min)\r
+ for_each(ip, ips) if(ip->min == group->min && ip->max > ip->min)\r
{\r
- if( ip->keyword->data_limit && !ip->fixedprio &&\r
- ip->traffic>ip->credit+\r
- (ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)) )\r
+ if( ip->keyword->data_limit && !ip->fixedprio \r
+ && ( ip->traffic>ip->credit\r
+ + (ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20))) )\r
{\r
if(group_rate<ip->max)\r
{\r
}\r
else\r
{\r
- if( ip->keyword->data_prio && !ip->fixedprio &&\r
- ip->traffic>ip->credit+\r
- (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20)) )\r
+ if( ip->keyword->data_prio \r
+ && !ip->fixedprio \r
+ && ( ip->traffic>ip->credit\r
+ + (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20))) )\r
{\r
ip->prio=priority_sequence--;\r
if(ip->prio<highest_priority+1)\r
fprintf(credit_file,"%s %Lu\n",ip->addr,lcredit);\r
}\r
}\r
- }\r
- \r
+ } \r
}\r
}\r
if(credit_file)\r
else if(!dry_run && !just_flush)\r
{\r
/*-----------------------------------------------------------------*/\r
- printf("Writing data transfer database ...\n");\r
+ printf("Writing daily statistics %s ... ", json);\r
/*-----------------------------------------------------------------*/\r
- f=fopen("/var/run/prometheus.previous","w");\r
- if(f)\r
+ f=fopen(json, "w");\r
+ if(f > 0)\r
{\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
+ int jsoncount=0;\r
+ fprintf(f, "{\n");\r
+ for_each(ip, ips)\r
+ {\r
+ if(jsoncount)\r
+ {\r
+ fprintf(f, ",\n");\r
+ }\r
+ if(ip->traffic || ip->direct || ip->proxy || ip->upload)\r
+ {\r
+ fprintf(f, "%d:{\"ip\":%s, \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu}\n",\r
+ ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);\r
+ }\r
+ jsoncount++;\r
+ }\r
+ fprintf(f, "}\n");\r
fclose(f);\r
+ puts("done.");\r
+ }\r
+ else\r
+ {\r
+ perror(json);\r
}\r
-\r
f=fopen(html,"w");\r
ptr=html;\r
}\r
\r
if(f)\r
{\r
- int total=0;\r
int count=1;\r
i=0;\r
\r
/*-----------------------------------------------------------------*/\r
- printf("Sorting data and generating statistics page %s ...\n",ptr);\r
+ printf("Sorting data and generating statistics page %s ...\n", ptr);\r
/*-----------------------------------------------------------------*/\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
-\r
- for_each(group,groups) \r
+ if(use_jquery_popups)\r
+ {\r
+ fprintf(f,"<script type=\"text/javascript\" src=\"%s\"></script>\n", jquery_url);\r
+ }\r
+ fputs("<table class=\"decorated last\">\n\\r
+<caption>Bandwidth classes</caption>\n\\r
+<thead><tr>\n\\r
+<th style=\"text-align: right\">#</th>\n\\r
+<th style=\"text-align: right\">group</th>\n\\r
+<th style=\"text-align: right\">IPs</th>\n\\r
+<th style=\"text-align: right\">requested</th>\n",f);\r
+ fprintf(f,"<th colspan=\"%d\">data limits</th>\n", keywordcount);\r
+ fputs("</tr></thead><tbody>\n",f);\r
+\r
+ row_odd_even = 0;\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
+ printf("%d kb/s group: %d bandwidth requested: %d kb/s\n",group->min,group->count,group->desired);\r
#endif\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
+ fprintf(f, "%s<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d kb/s</td>",\r
+ tr_odd_even(), count, group->min);\r
+ fprintf(f, "<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d kb/s</td>",\r
+ group->count, group->desired);\r
\r
- for_each(keyword,keywords)\r
+ for_each(keyword, keywords) if(keyword->ip_count)\r
{\r
- fprintf(f,"<td align=\"right\"><font color=\"#%s\">%d M</font></td>",keyword->html_color,group->min*keyword->data_limit);\r
+ fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%d MB</span></td>",\r
+ keyword->html_color, group->min*keyword->data_limit);\r
} \r
- i+=group->desired; \r
- total+=group->count;\r
+ i += group->desired; \r
+ total += group->count;\r
count++; \r
}\r
#ifdef DEBUG\r
- printf("Total groups: %d Total bandwidth requested: %d k\nAGGREGATION: 1/%d\n",count,i,i/line);\r
+ printf("Total groups: %d Total bandwidth requested: %d kb/s\nAGGREGATION: 1/%d\n",\r
+ count, i, i/line);\r
#endif\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
+ fprintf(f,"</tr></tbody>\n\\r
+<thead><tr>\n\\r
+<th colspan=\"2\" style=\"text-align: left\">Line %Ld kb/s</td>",line);\r
+ fprintf(f,"<th style=\"text-align: right\">%d</td><th style=\"text-align: right\">%d kb/s</td>",total,i);\r
\r
- for_each(keyword,keywords)\r
+ for_each(keyword, keywords) if(keyword->ip_count)\r
{\r
- fprintf(f,"<th align=\"right\">%d IPs</th>",keyword->ip_count);\r
+ fprintf(f,"<th style=\"text-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
+ 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
- fputs("</table>\n",f);\r
+ fputs("</thead></table>\n",f);\r
}\r
- else if(!dry_run && !just_flush) \r
+ else if(!dry_run && !just_flush)\r
+ {\r
perror(html);\r
+ }\r
\r
- i=1;\r
+ i=0;\r
if(f)\r
{\r
- unsigned long long total=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;\r
+ unsigned long long total_traffic=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;\r
int active_classes=0;\r
- int colspan;\r
- FILE *iplog;\r
+ int colspan=12;\r
struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums=NULL;\r
+ int limit_count=0, prio_count=0;\r
+ int popup_button=0;\r
\r
- colspan=11;\r
if(qos_proxy)\r
{\r
colspan++;\r
}\r
- if(found_lmsid)\r
- {\r
- colspan++;\r
- }\r
\r
- fprintf(f,"<p><table border>\n<tr><th colspan=\"%d\">%s",colspan,title);\r
- fprintf(f," (%s)</th></tr>\n", d);\r
- fputs("<tr><td align=\"right\">#</td><td>hostname</td>",f);\r
- if(found_lmsid)\r
- {\r
- fputs("<td align=\"right\">lms</td>\n",f);\r
- }\r
- fputs("<td align=\"right\">credit</td>\\r
-<td align=\"right\">limit</td>\\r
-<td align=\"right\">total</td>\\r
-<td align=\"right\">direct</td>\n",f);\r
+ fprintf(f,"<p><table class=\"decorated last\">\n<caption>%s",title);\r
+ fprintf(f," (%s)</caption>\n", d);\r
+ fputs("<thead><tr>\n<th colspan=\"3\"> </th>\n",f);\r
+ fputs("<th style=\"text-align: right\">credit</th>\n\\r
+<th style=\"text-align: right\">FUP</th>\n\\r
+<th style=\"text-align: right\">total</th>\n\\r
+<th style=\"text-align: right\">down</th>\n",f);\r
if(qos_proxy)\r
{\r
- fputs("<td align=\"right\">proxy</td>\n",f);\r
+ fputs("<th style=\"text-align: right\">proxy</th>\n",f);\r
}\r
- fputs("<td align=\"right\">upload</td>\\r
-<td align=\"right\">minimum</td>\\r
-<td align=\"right\">desired</td>\\r
-<td align=\"right\">maximum</td>\\r
-<td>prio</td></tr>\n",f); \r
-\r
- for_each(ip,ips)\r
+ fputs("<th style=\"text-align: right\">up</th>\n\\r
+<th style=\"text-align: right\">min</th>\n\\r
+<th style=\"text-align: right\">max</th>\n\\r
+<th style=\"text-align: right\">limit</th>\n\\r
+<th> </th>\n\\r
+</tr><tr>\n\\r
+<th style=\"text-align: right\">#</th>\n\\r
+<th>hostname [+sharing]</th>\n\\r
+<th style=\"text-align: right\">LMS</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">kb/s</th>\n\\r
+<th style=\"text-align: right\">kb/s</th>\n\\r
+<th style=\"text-align: right\">kb/s</th>\n\\r
+<th>prio</th>\n\\r
+</tr></thead><tbody>\n",f); \r
+\r
+ row_odd_even = 0;\r
+ for_each(ip,ips) if(!use_jquery_popups || !ip->sharing)\r
{\r
char *f1="", *f2="";\r
- if(ip->max<ip->desired)\r
+ i++;\r
+ \r
+ if(ip->max < ip->desired)\r
{\r
- f1="<font color=\"red\">";\r
- f2="</font>";\r
+ f1="<span style=\"color:red\">";\r
+ f2="</span>";\r
+ limit_count++;\r
}\r
- else if(ip->prio>highest_priority+1)\r
+ else if(ip->prio > highest_priority+1)\r
{\r
- f1="<font color=\"brown\">";\r
- f2="</font>";\r
+ f1="<span style=\"color:brown\">";\r
+ f2="</span>";\r
+ prio_count++;\r
}\r
\r
#ifdef DEBUG\r
printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); \r
#endif\r
- fprintf(f,"<tr><td align=\"right\"><a name=\"%s\"></a>%d</td><td><a href=\"%s%s.log\">%s</a></td>\n", ip->name, i, log_url, ip->name, ip->name);\r
+ /* hostnames -------------------------------------- */\r
+ fprintf(f,"%s<td style=\"text-align: right\"><a name=\"%s\"></a>%d</td><td><a class=\"blue\" href=\"%s%s.log\">%s</a>\n", \r
+ tr_odd_even(), ip->name, i, log_url, ip->name, ip->name);\r
+\r
+ if(use_jquery_popups)\r
+ {\r
+ fprintf(f,"<span id=\"sharing_%d\" style=\"display:none\">",i);\r
+ popup_button=0;\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
+ {\r
+ fprintf(f,"<br /><a class=\"blue\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);\r
+ popup_button++;\r
+ }\r
+ fputs("</span>\n",f);\r
+ if(popup_button)\r
+ {\r
+ fprintf(f,"<span>[<a class=\"blue\" href=\"#\" onClick=\"$(this).parent().hide();$(\'#sharing_%d\').show();$(\'#download_%d\').show();$(\'#upload_%d\').show();return(false);\" style=\"cursor: pointer;\">+%d</a>]</span>",\r
+ i, i, i, popup_button);\r
+ }\r
+ }\r
+ fputs("</td>\n",f);\r
+ /* ----------------------------------------------- */\r
+\r
if(found_lmsid)\r
{\r
- fputs("<td align=\"right\">",f);\r
+ fputs("<td style=\"text-align: right\">",f);\r
if(ip->lmsid > 0)\r
{\r
- /*base URL will be configurable soon ... */\r
- fprintf(f,"<a href=\"https://hermes.spoje.net/?m=customerinfo&id=%d\">%04d</a>\n", ip->lmsid, ip->lmsid);\r
+ fprintf(f,"<a class=\"blue\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);\r
}\r
else if(ip->lmsid == 0)\r
{\r
fputs("-------",f);\r
}\r
- fputs("</td>\n",f); \r
+ fputs("</td>\n",f);\r
+ }\r
+ fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->credit);\r
+ fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%Lu</span></td>",\r
+ ip->keyword->html_color,\r
+ ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));\r
+ fprintf(f,"<td style=\"text-align: right\">%s%Lu%s", f1, ip->traffic, f2);\r
+\r
+ /* download --------------------------------------- */\r
+ fprintf(f,"</td><td style=\"text-align: right\">%Lu", ip->direct);\r
+ if(use_jquery_popups)\r
+ {\r
+ fprintf(f,"<span id=\"download_%d\" style=\"display:none\">",i);\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
+ {\r
+ fprintf(f,"<br />%Lu", sharedip->direct);\r
+ }\r
+ fputs("</span>\n",f);\r
}\r
- fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->credit);\r
- fprintf(f,"<td align=\"right\"><font color=\"#%s\">%Lu M</font></td>",\r
- ip->keyword->html_color, ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));\r
- fprintf(f,"<td align=\"right\">%s%Lu M%s</td><td align=\"right\">%Lu M</td>\n", f1, ip->traffic, f2, ip->direct);\r
+ fputs("</td>\n",f);\r
+ /* ----------------------------------------------- */\r
+\r
if(qos_proxy)\r
{\r
- fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->proxy);\r
+ fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->proxy);\r
+ }\r
+ /* upload ---------------------------------------- */\r
+ fprintf(f,"<td style=\"text-align: right\">%Lu", ip->upload);\r
+ if(use_jquery_popups)\r
+ {\r
+ fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">",i);\r
+ for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
+ {\r
+ fprintf(f,"<br />%Lu", sharedip->upload);\r
+ if(!just_preview)\r
+ {\r
+ append_log(sharedip);\r
+ }\r
+ }\r
+ fputs("</span>\n",f);\r
}\r
- fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->upload);\r
- fprintf(f,"<td align=\"right\">%d k</td><td align=\"right\">%d k</td><td align=\"right\">%s%d k%s</td><td>%s%d%s</td></tr>\n",\r
- ip->min,ip->desired,f1,ip->max,f2,f1,ip->prio,f2);\r
- total+=ip->traffic;\r
+ fputs("</td>\n",f);\r
+ /* ----------------------------------------------- */\r
+\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%s%d%s</td>\n\\r
+<td>%s%d%s</td></tr>\n",\r
+ ip->min, ip->desired, \r
+ f1, ip->max, f2, \r
+ f1, ip->prio, f2);\r
+\r
+ total_traffic+=ip->traffic;\r
total_direct+=ip->direct;\r
total_proxy+=ip->proxy;\r
total_upload+=ip->upload;\r
sum->i=active_classes;\r
insert(sum,sums,order_by,i);\r
}\r
- \r
- i++;\r
- \r
+\r
if(!just_preview)\r
{\r
- sprintf(str,"%s/%s.log",log_dir,ip->name);\r
- iplog=fopen(str,"a");\r
- if(iplog)\r
- {\r
- fprintf(iplog,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",\r
- time(NULL),ip->name,ip->traffic,ip->direct,ip->proxy,ip->upload,ip->min,ip->max,ip->desired,ip->lmsid,d); /* d = date*/\r
- fclose(iplog);\r
- }\r
+ append_log(ip);\r
}\r
}\r
- fprintf(f,"<tr><th colspan=\"%d\" align=\"left\">SUMMARY:</td>",colspan-7);\r
- fprintf(f,"<th align=\"right\">%Lu M</th>\\r
- <th align=\"right\">%Lu M</th>\n", total, total_direct);\r
+ fprintf(f,"</tbody><thead><tr>\n\\r
+<th colspan=\"%d\" style=\"text-align: left\">%d CLASSES</th>", colspan-7, i);\r
+ fprintf(f,"<th style=\"text-align: right\">%Lu</th><th style=\"text-align: right\">%Lu</th>\n", total_traffic, total_direct);\r
if(qos_proxy)\r
{\r
- fprintf(f,"<th align=\"right\">%Lu M</th>\n", total_proxy);\r
+ fprintf(f,"<th style=\"text-align: right\">%Lu</th>\n", total_proxy);\r
}\r
- fprintf(f,"<th align=\"right\">%Lu M</th>", total_upload);\r
- fputs("<td colspan=\"4\"></td></th>\n</table>\n",f);\r
+ fprintf(f,"<th style=\"text-align: right\">%Lu</th>", total_upload);\r
+ fprintf(f,"<th colspan=\"4\"><span style=\"color:red\">LIMIT %dx</span> <span style=\"color:brown\">LOW-PRIO %dx</span></th></tr>\n</thead></table>\n",limit_count,prio_count);\r
\r
+ row_odd_even = 0;\r
if(active_classes>10)\r
{\r
int top20_count=0,top20_perc1=0;\r
long long top20_perc2=0;\r
unsigned long long top20_sum=0l;\r
\r
- fputs("<a name=\"erp\"></a><p><table border><tr><th colspan=\"5\">Enterprise Resource 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(sum,sums,sum->l>=total/4)\r
+ fputs("<a name=\"erp\"></a><p><table class=\"decorated last\"><caption>Enterprise Resource Planning (ERP)</caption>\n",f);\r
+ fputs("<thead><tr>\n\\r
+<th>Analytic category</th>\n\\r
+<th colspan=\"2\" style=\"text-align: center\">Active Classes</th>\n\\r
+<th colspan=\"2\" style=\"text-align: center\">Data transfers</th>\n\\r
+</tr></thead><tbody>\n",f);\r
+\r
+ if_exists(sum,sums,sum->l>=total_traffic/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
+ fprintf(f,"%s<td>Top 25%% of traffic</td>\n", tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d %%</td><td style=\"text-align: right\">%Lu M</td><td style=\"text-align: right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
}\r
\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
+ fprintf(f,"%s<td>Top 10 downloaders</td>\n", tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\"><strong>10</strong></td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
+ (100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
}\r
\r
- if_exists(sum,sums,sum->l>=total/2)\r
+ if_exists(sum,sums,sum->l>=total_traffic/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
+ fprintf(f,"%s<td>Top 50%% of traffic</td>\n", tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\"><strong>%Ld %%</strong></td></tr>\n",\r
+ sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
}\r
\r
- if_exists(sum,sums,sum->l>=4*total/5)\r
+ if_exists(sum,sums,sum->l>=4*total_traffic/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
+ fprintf(f,"%s<td>Top 80%% of traffic</td>\n", tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\"><strong>%Ld %%</strong></td></tr>\n",\r
+ sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
}\r
\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,"%s<td>Top 20%% downloaders</td>\n", tr_odd_even());\r
top20_count=sum->i;\r
top20_perc1=(100*sum->i+50)/active_classes;\r
top20_sum=sum->l;\r
- top20_perc2=(100*sum->l+50)/total;\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",top20_count,top20_perc1,top20_sum,top20_perc2);\r
+ top20_perc2=(100*sum->l+50)/total_traffic;\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
+ top20_count,top20_perc1,top20_sum,top20_perc2);\r
}\r
\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
+ fprintf(f,"%s<td>Top 25%% downloaders</td>\n", tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
+ sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
}\r
\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
+ fprintf(f,"%s<td>Top 50%% downloaders</td>\n", tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
+ sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
}\r
\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
+ fprintf(f,"%s<td>Top 80%% downloaders</td>\n", tr_odd_even());\r
+ fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
+<td style=\"text-align: right\">%d %%</td>\n\\r
+<td style=\"text-align: right\">%Lu MB</td>\n\\r
+<td style=\"text-align: right\">%Ld %%</td></tr></tbody>\n",\r
+ sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
}\r
\r
- fprintf(f,"<tr><td><a href=\"%sERP.log\">All users, all traffic</a></td>\n", log_url);\r
- fprintf(f,"<th align=\"right\">%d</th><th align=\"right\">100 %%</th><th align=\"right\">%Lu M</th><th align=\"right\">100 %%</th></tr>\n",active_classes,total);\r
- fputs("</table>\n", f);\r
+ fprintf(f,"<tr><thead><th><a class=\"blue\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);\r
+ fprintf(f,"<th style=\"text-align: right\">%d</th>\n\\r
+<th style=\"text-align: right\">100 %%</th>\n\\r
+<th style=\"text-align: right\">%Lu M</th>\n\\r
+<th style=\"text-align: right\">100 %%</th></tr>\n",active_classes,total_traffic);\r
+ fputs("</thead></table>\n", f);\r
\r
/* write basic ERP data to log directory */\r
if(!just_preview)\r
{\r
+ FILE *iplog;\r
sprintf(str,"%s/ERP.log",log_dir);\r
iplog=fopen(str,"a");\r
if(iplog)\r
{\r
- fprintf(iplog,"%ld\t%d\t%d %%\t%Lu M\t%Ld %%\t%d\t%Lu M\t%s",\r
- time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, active_classes, total, d); /* d = date*/\r
+ fprintf(iplog,"%ld\t%d\t%d %%\t%Lu M\t%Ld %%\tACTIVE %d\tTRAFFIC %Lu M\tCLASSES %d\tFUP-LIMIT %d\tLOW-PRIO %d\t%s",\r
+ time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, \r
+ active_classes, total_traffic, i, limit_count, prio_count, d); /* d = date*/\r
fclose(iplog);\r
}\r
+ else\r
+ {\r
+ perror(str);\r
+ }\r
}\r
}\r
\r
{\r
puts("Statistics preview generated (-p switch) - now exiting ...");\r
exit(0);\r
- }\r
- \r
- /*-----------------------------------------------------------------*/\r
- puts("Generating iptables and tc classes ...");\r
- /*-----------------------------------------------------------------*/\r
+ } \r
\r
i=0;\r
+#ifdef DEBUG\r
printf("%-22s %-15s mark\n","name","ip");\r
+#endif\r
\r
- for_selected(ip,ips,ip->mark>0)\r
- { \r
- \r
+ printf("Writing %s ... ", classmap); \r
+ f = fopen(classmap, "w"); \r
+ if(f < 0)\r
+ {\r
+ perror(classmap);\r
+ }\r
+\r
+ /*-----------------------------------------------------------------*/\r
+ puts("Generating iptables and tc classes ... ");\r
+ /*-----------------------------------------------------------------*/\r
+\r
+ for_each(ip, ips) if(ip->mark > 0)\r
+ {\r
if(idxs)\r
{\r
char *buf;\r
chain_postrouting="POSTROUTING";\r
}\r
\r
+#ifdef DEBUG\r
printf("%-22s %-16s %04d ", ip->name, ip->addr, ip->mark); \r
+#endif\r
\r
/* -------------------------------------------------------- mark download */\r
\r
- sprintf(str,"-A %s -d %s/32 -o %s -j %s%d",chain_postrouting,ip->addr,lan,mark_iptables,ip->mark);\r
+ sprintf(str, "-A %s -d %s/32 -o %s -j %s%d",\r
+ chain_postrouting, ip->addr, lan, mark_iptables, ip->mark);\r
/*sprintf(str,"-A %s -d %s/32 -o %s -j MARK --set-mark %d",chain_postrouting,ip->addr,lan,ip->mark);*/\r
/* -m limit --limit 1/s */ \r
save_line(str);\r
\r
if(qos_proxy)\r
{\r
- 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);\r
+ sprintf(str, "-A %s -s %s -p tcp --sport %d -d %s/32 -o %s -j %s%d",\r
+ chain_postrouting, proxy_ip, proxy_port, ip->addr, lan, mark_iptables, ip->mark);\r
/*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);*/\r
save_line(str);\r
}\r
\r
- sprintf(str,"-A %s -d %s/32 -o %s -j ACCEPT",chain_postrouting,ip->addr,lan);\r
+ sprintf(str, "-A %s -d %s/32 -o %s -j ACCEPT",\r
+ chain_postrouting, ip->addr, lan);\r
save_line(str);\r
\r
/* -------------------------------------------------------- mark upload */\r
- sprintf(str,"-A %s -s %s/32 -o %s -j %s%d",chain_forward,ip->addr,wan,mark_iptables,ip->mark);\r
+ sprintf(str, "-A %s -s %s/32 -o %s -j %s%d", \r
+ chain_forward, ip->addr, wan, mark_iptables, ip->mark);\r
/* sprintf(str,"-A %s -s %s/32 -o %s -j MARK --set-mark %d",chain_forward,ip->addr,wan,ip->mark);*/\r
save_line(str);\r
\r
- sprintf(str,"-A %s -s %s/32 -o %s -j ACCEPT",chain_forward,ip->addr,wan);\r
+ sprintf(str, "-A %s -s %s/32 -o %s -j ACCEPT",\r
+ chain_forward, ip->addr, wan);\r
save_line(str);\r
\r
if(ip->min)\r
{\r
/* -------------------------------------------------------- download class */\r
+#ifdef DEBUG\r
printf("(down: %dk-%dk ", ip->min, ip->max); \r
+#endif\r
\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
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", \r
+ 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
+ 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
+ sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s", \r
+ tc, lan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
safe_run(str);\r
- } \r
- if (filter_type == 1)\r
+ }\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
+ sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",\r
+ tc, lan, ip->mark, ip->mark);\r
safe_run(str);\r
}\r
\r
/* -------------------------------------------------------- upload class */\r
+#ifdef DEBUG\r
printf("up: %dk-%dk)\n", (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), \r
(int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed));\r
+#endif\r
\r
sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
tc, wan, ip->group, ip->mark,\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
+ 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
+ sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s",\r
+ tc, wan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
safe_run(str);\r
} \r
- if (filter_type == 1)\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
+ sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",\r
+ tc, wan, ip->mark, ip->mark);\r
safe_run(str);\r
}\r
+ \r
+ if(f)\r
+ {\r
+ fprintf(f, "%s %d", ip->addr, ip->mark);\r
+ }\r
}\r
else\r
+ {\r
+#ifdef DEBUG\r
printf("(sharing %s)\n", ip->sharing);\r
+#endif\r
+ }\r
i++;\r
}\r
-\r
+ if(f)\r
+ {\r
+ puts("done.");\r
+ fclose(f);\r
+ }\r
+ \r
if(idxs)\r
{\r
chain_forward = "forw_common";\r
/* -------------------------------- classify or reject free download */\r
{\r
char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */\r
- if(free_min) final_chain = "ACCEPT";\r
+ if(free_min)\r
+ {\r
+ final_chain = "ACCEPT";\r
+ }\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
+ sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s%d",\r
+ 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
+ sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s",\r
+ 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
+ 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
+ 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
+ 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
+ sprintf(str,"-A %s -o %s -j %s", chain_forward, wan, final_chain);\r
save_line(str);\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 %d",\r
- tc,lan,parent,free_min,free_max,burst,lowest_priority);\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 %d",\r
- tc,wan,parent,free_min,free_max,burst,lowest_priority);\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
+ 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
+ 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
+ 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
+ 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
+ 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
printf("Total IP count: %d\n", i);\r
run_restore(); \r
- if (log_file) fclose(log_file);\r
+ if(log_file)\r
+ {\r
+ fclose(log_file);\r
+ }\r
return 0;\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
GIT.Harvie.CZ / svn / Prometheus-QoS / .git / blobdiff