/* Prometheus QoS - you can "steal fire" from your ISP */\r
/* "fair-per-IP" quality of service (QoS) utility */\r
/* requires Linux 2.4.x or 2.6.x with HTB support */\r
-/* Copyright(C) 2005-2008 Michael Polak (xChaos) */\r
+/* Copyright(C) 2005-2012 Michael Polak, Arachne Labs */\r
/* iptables-restore support Copyright(C) 2007-2008 ludva */\r
/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */\r
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
\r
-/* Modified by: xChaos, 20120516\r
+/* Modified by: xChaos, 20120610\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-d";\r
+const char *version = "0.8.3-f";\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 = "<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
+const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2012 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";\r
\r
/* ======= All path names are defined here (for RPM patch) ======= */\r
\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 *json = "/var/www/logs/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
{\r
puts("Command line switches:\n\\r
\n\\r
--?, --help this help screen\n\\r
--v, --version show Version number of this utility and exit\n\\r
--c filename force alternative /etc/prometheus.Conf filename\n\\r
--h filename force alternative /etc/Hosts filename (overrides hosts keyword)\n\\r
--f just Flush iptables and tc classes and exit (stop shaping)\n\\r
--9 emergency iptables flush (do not read data transfer statistics)\n\\r
--p just generate Preview of data transfer statistics and exit\n\\r
--d Dry run (preview tc and iptables commands on stdout)\n\\r
--r Run (reset all statistics and start shaping)\n\\r
--n run Now (start shaping without delay - overrides qos-free-delay keyword)\n\\r
--l Mmm YYYY generate HTML summary of traffic Logs (Mmm=Jan-Dec or Year, YYYY=year)\n\\r
--m generate HTML summary of traffic logs for yesterday's Month\n\\r
--y generate HTML summary of traffic logs for yesterday's Year\n");\r
-/* not yet implemented:\r
--s start shaping! (keep data transfer statistics - but apply shaping)\n\\r
-*/\r
+-d Dry run (preview tc and iptables commands on stdout)\n\\r
+-r Run (reset all statistics and start shaping - daily usage)\n\\r
+-p just generate Preview of data transfer statistics and exit (after -r)\n\\r
+-s start Shaping FUP limits (keeps data transfer stat like -p) (after -r)\n\\r
+-n run Now (like -r delay - overrides qos-free-delay keyword, after boot)\n\\r
+-f just Flush iptables and tc classes and exit (stop shaping, no QiS)\n\\r
+-9 emergency iptables flush (like -f, but dumps data transfer statistics)\n\\r
+\n\\r
+-c filename force alternative /etc/prometheus/prometheus.conf filename\n\\r
+-h filename force alternative /etc/hosts filename (overrides hosts keyword)\n\\r
+-l Mmm YYYY generate HTML summary of Logged traffic (Mmm=Jan-Dec) (and exit)\n\\r
+-m generate HTML summary of traffic for yesterday's Month (and exit)\n\\r
+-y generate HTML summary of traffic for yesterday's Year (and exit)\n\\r
+-? --help show this help scree (and exit)\n\\r
+-v --version show Version number of this utility (and exit)\n");\r
}\r
\r
/* === Configuraration file values defaults - stored in global variables ==== */\r
perror(config_filename);\r
puts("Warning - using built-in defaults instead ...");\r
}\r
- done;\r
+ done; /* ugly macro end */\r
printf("\n");\r
\r
/* leaf discipline for keywords */\r
{\r
printf("(upload) ");\r
}\r
- printf("IP %s: %Lu M (%ld pkts)\n", ipaddr, traffic, pkts);\r
+ printf("IP %s: %Lu MB (%ld pkts)\n", ipaddr, traffic, pkts);\r
\r
if_exists(ip,ips,eq(ip->addr,ipaddr)); \r
else \r
}\r
} \r
}\r
-\r
- free(cmd);\r
+ free(cmd);\r
}\r
\r
/* ========== This function executes, logs OR ALSO prints command ========== */\r
string(restor,STRLEN);\r
\r
/*-----------------------------------------------------------------*/\r
- printf("Running %s <%s ...\n",iptablesrestore,iptablesfile);\r
+ printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);\r
/*-----------------------------------------------------------------*/\r
\r
save_line("COMMIT");\r
{\r
printf("%s\n",_);\r
}\r
- done;\r
+ done; /* ugly macro end */\r
}\r
\r
sprintf(restor,"%s <%s",iptablesrestore, iptablesfile);\r
accept_month = 1;\r
}\r
}\r
- done;\r
+ done; /* ugly macro end */ \r
\r
if(accept_month)\r
{\r
if(iplog->traffic)\r
{\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: left\"><a class=\"blue\" target=\"_blank\" 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 class=\"blue\" href=\"%s%d\">%04d</a>\n", lms_url, iplog->lmsid, iplog->lmsid);\r
+ fprintf(f, "<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, iplog->lmsid, iplog->lmsid);\r
}\r
else if(iplog->lmsid == 0)\r
{\r
}\r
}\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
+ <th colspan=\"3\" style=\"text-align: left\">Total:</th>\\r
+ <th colspan=\"2\" style=\"text-align: right\"><strong>%ld GB</strong></th>\\r
+ <th style=\"text-align: right\"><strong>%Ld kb/s</strong></th></tr>\n", total, line);\r
fputs("</thead></table>\n", f);\r
\r
row_odd_even = 0;\r
if_exists(iplog,iplogs,iplog->l>=total/4)\r
{\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
+ 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 GB</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==10)\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\">%ld GB</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
+ (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
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\">%ld GB</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
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\">%ld GB</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
+ 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
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\">%ld GB</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
+ 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,"%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
+ 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 GB</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/2)\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
+<td style=\"text-align: right\">%ld GB</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>=4*i/5)\r
{\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
+ 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 GB</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
- fprintf(f,"</tbody><thead><tr>\n\\r
-<th>All users, all traffic</th>\n\\r
-<th style=\"text-align: right\">%d</th>\n\\r
+ fprintf(f,"</tbody><thead><tr><th><a class=\"blue\" target=\"_blank\" 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\">%ld G</th>\n\\r
+<th style=\"text-align: right\">%ld GB</th>\n\\r
<th style=\"text-align: right\">100 %%</th></tr>\n",i-1,total);\r
fputs("</thead></table>\n", f);\r
}\r
\r
program\r
{\r
- int i=0;\r
- FILE *f=NULL;\r
- char *str, *ptr, *d;\r
+ int i=0; /* just plain old Fortran style integer :-) */\r
+ FILE *f=NULL; /* everything is just stream of bytes... */\r
+ char *str, *ptr, *d; /* LET A$=B$ :-) */\r
char *substring;\r
int class_count=0,ip_count=0;\r
int parent=1;\r
- int just_flush=FALSE;\r
+ int just_flush=FALSE; /* deactivates all previous actions */\r
int nodelay=FALSE;\r
- int just_preview=FALSE; /* preview - generate just stats */\r
- int just_logs=FALSE; /* just parse logs */\r
+ int just_preview=FALSE; /* preview - generate just stats */\r
+ int start_shaping=FALSE; /* apply FUP - requires classmap file */\r
+ int just_logs=FALSE; /* just parse logs */\r
int run=FALSE;\r
int total=0;\r
\r
\r
printf("\n\\r
Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\\r
-Version %s - Copyright (C)2005-2012 Michael Polak (xChaos)\n\\r
+Version %s - Copyright (C)2005-2012 Michael Polak, Arachne Labs\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
- /*----- Boring... we have to check command line options first: ----*/\r
- \r
+ /*----- Boring... we have to check command line options first: ----*/ \r
arguments\r
{\r
argument("-c") { nextargument(config); }\r
argument("-f") { run=TRUE; just_flush=TRUE; }\r
argument("-9") { run=TRUE; just_flush=9; }\r
argument("-p") { run=TRUE; just_preview=TRUE; }\r
+ argument("-s") { run=TRUE; just_preview=TRUE; start_shaping=TRUE; }\r
argument("-r") { run=TRUE; }\r
argument("-n") { run=TRUE; nodelay=TRUE; }\r
argument("-l") { just_logs=TRUE; }\r
perror(hosts);\r
exit(-1);\r
}\r
- done;\r
+ done; /* ugly macro end */\r
\r
/*-----------------------------------------------------------------*/\r
/* cll1.h - let's allocate brand new character buffer... */\r
}\r
}\r
}\r
- done;\r
+ done; /* ugly macro end */\r
}\r
\r
if(!just_preview)\r
\r
if(just_preview)\r
{\r
+ if(start_shaping)\r
+ {\r
+ printf("Reading %s and applying Fair Use Policy rules ... \n", classmap);\r
+ parse(classmap)\r
+ {\r
+ ptr=strchr(_,' ');\r
+ if(ptr)\r
+ {\r
+ *ptr=0;\r
+ ptr++;\r
+ if_exists(ip,ips,eq(ip->addr,_))\r
+ {\r
+ ip->mark=atoi(ptr);\r
+ if(ip->max < ip->desired) /* apply FUP limit immediately.... */\r
+ {\r
+ printf("Applying limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark); \r
+ printf("(down: %dk-%dk ", ip->min, ip->max); \r
+ sprintf(str, "%s class change 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
+ 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
+ sprintf(str,"%s class change 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->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),\r
+ (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio);\r
+ safe_run(str);\r
+ }\r
+ }\r
+ }\r
+ }\r
+ fail\r
+ { \r
+ perror(classmap);\r
+ puts("Warning - classmap file not fund, just generating preview ...");\r
+ start_shaping=FALSE;\r
+ }\r
+ done; /* ugly macro end */\r
+ }\r
f=fopen(preview,"w");\r
ptr=preview; \r
}\r
fprintf(f, "{\n");\r
for_each(ip, ips)\r
{\r
- if(jsoncount)\r
+ if( ip->lmsid > 0 \r
+ && (ip->traffic || ip->direct || ip->proxy || ip->upload))\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
+ if(jsoncount)\r
+ {\r
+ fprintf(f, ",\n");\r
+ }\r
+ fprintf(f, " \"%s\":{ \"lms\": %d, \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu }",\r
+ ip->name, ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);\r
+ jsoncount++;\r
}\r
- jsoncount++;\r
}\r
fprintf(f, "}\n");\r
fclose(f);\r
char *f1="", *f2="";\r
i++;\r
\r
- if(ip->max < ip->desired)\r
- {\r
- f1="<span style=\"color:red\">";\r
- f2="</span>";\r
- limit_count++;\r
- }\r
- else if(ip->prio > highest_priority+1)\r
- {\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
/* 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
+ fprintf(f,"%s<td style=\"text-align: right\"><a name=\"%s\"></a>%d</td><td><a class=\"blue\" target=\"_blank\" 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
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
+ fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);\r
popup_button++;\r
}\r
fputs("</span>\n",f);\r
fputs("<td style=\"text-align: right\">",f);\r
if(ip->lmsid > 0)\r
{\r
- fprintf(f,"<a class=\"blue\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);\r
+ fprintf(f,"<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);\r
}\r
else if(ip->lmsid == 0)\r
{\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
if(!just_preview)\r
{\r
append_log(ip);\r
+ for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
+ {\r
+ append_log(sharedip);\r
+ }\r
}\r
}\r
fprintf(f,"</tbody><thead><tr>\n\\r
if_exists(sum,sums,sum->l>=total_traffic/4)\r
{\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
+ 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==10)\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
+ (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);\r
}\r
\r
if_exists(sum,sums,sum->l>=total_traffic/2)\r
sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
}\r
\r
- fprintf(f,"<tr><thead><th><a class=\"blue\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);\r
+ fprintf(f,"<thead><tr><th><a class=\"blue\" target=\"_blank\" 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\">%Lu MB</th>\n\\r
<th style=\"text-align: right\">100 %%</th></tr>\n",active_classes,total_traffic);\r
fputs("</thead></table>\n", f);\r
\r
\r
if(just_preview)\r
{\r
- puts("Statistics preview generated (-p switch) - now exiting ...");\r
+ char swchar='p';\r
+ if(start_shaping)\r
+ {\r
+ swchar='s';\r
+ }\r
+ printf("Statistics preview generated (-%c switch) - now exiting ...\n", swchar);\r
exit(0);\r
} \r
\r
\r
if(f)\r
{\r
- fprintf(f, "%s %d", ip->addr, ip->mark);\r
+ fprintf(f, "%s %d\n", ip->addr, ip->mark);\r
}\r
}\r
else\r
GIT.Harvie.CZ / svn / Prometheus-QoS / .git / blobdiff