+/* Modified by: xChaos, 20131119 */\r
+\r
#include "cll1-0.6.2.h"\r
#include "ipstruct.h"\r
#define STRLEN 512\r
if(f > 0)\r
{\r
unsigned long long total_traffic=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum = 0;\r
+ unsigned long long total_pktup = 0, total_pktdown = 0;\r
int active_classes = 0;\r
- int colspan = 12;\r
+// int colspan = 14;\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
/* IPv6 vs. IPv4 stats */\r
unsigned long long pkts4 =0, pkts6 = 0, bytes4 = 0, bytes6 = 0;\r
int count4 = 0, count6 = 0;\r
+ int mpkts;\r
double perc6;\r
\r
+/*\r
if(qos_proxy)\r
{\r
colspan++;\r
}\r
- \r
+*/ \r
+ if(use_jquery_popups)\r
+ {\r
+ fprintf(f,"<script type=\"text/javascript\">\\r
+function show_section(n) {\\r
+$(\'#sharing_\'+n).show();\\r
+$(\'#download_'+n).show();\\r
+$(\'#pktsdown_\'+n).show();\\r
+$(\'#upload_'+n).show();\\r
+$(\'#pktsup_\'+n).show();\\r
+} </script>");\r
+ }\r
+\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
+ fputs("<th style=\"text-align: right\">cred.</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
+<th style=\"text-align: center\" colspan=\"2\">upload</th>\n",f);\r
+/*\r
if(qos_proxy)\r
{\r
fputs("<th style=\"text-align: right\">proxy</th>\n",f);\r
}\r
- fputs("<th style=\"text-align: right\">up</th>\n\\r
+*/\r
+ fputs("<th style=\"text-align: center\" colspan=\"2\">download</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 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\">pkt</th>\n\\r
<th style=\"text-align: right\">MB</th>\n\\r
+<th style=\"text-align: right\">pkt</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
+<th>!</th>\n\\r
</tr></thead><tbody>\n",f); \r
\r
row_odd_even = 0;\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\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", \r
+ fprintf(f,"%s<td style=\"text-align: right\"><a name=\"%s\"></a>%d</td>\\r
+<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
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
+ fprintf(f, "<span>[<a class=\"blue\" href=\"#\" \\r
+onClick=\"$(this).parent().hide();show_section(\'%d\');return(false);\" \\r
+style=\"cursor: pointer;\">+%d</a>]</span>",\r
+ i, popup_button);\r
}\r
}\r
fputs("</td>\n",f);\r
fputs("<td style=\"text-align: right\">",f);\r
if(ip->lmsid > 0)\r
{\r
- fprintf(f,"<a class=\"blue\" target=\"_blank\" 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",\r
+ lms_url, ip->lmsid, ip->lmsid);\r
}\r
else if(ip->lmsid == 0)\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, ip->realquota);\r
- fprintf(f,"<td style=\"text-align: right\">%s%Lu%s", f1, ip->traffic, f2);\r
+ fprintf(f,"<td style=\"text-align: right\">%s%Lu%s</td>", f1, ip->traffic, f2);\r
\r
- /* download --------------------------------------- */\r
- fprintf(f,"</td><td style=\"text-align: right\">%Lu", ip->direct);\r
+ /* upload --------------------------------------- */\r
+ fprintf(f,"<td style=\"text-align: right\">%Lu", ip->upload);\r
if(use_jquery_popups)\r
{\r
- fprintf(f,"<span id=\"download_%d\" style=\"display:none\">", i);\r
+ fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">", i);\r
for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */\r
{\r
- fprintf(f,"<br />%Lu", sharedip->direct);\r
+ fprintf(f,"<br />%Lu", sharedip->upload);\r
}\r
for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */\r
{\r
- fprintf(f,"<br />%Lu", sharedip->direct);\r
+ fprintf(f,"<br />%Lu", sharedip->upload);\r
}\r
fputs("</span>\n",f);\r
}\r
fputs("</td>\n",f);\r
- /* ----------------------------------------------- */\r
\r
+ /* pkts up ----------------------------------- */\r
+ mpkts = ip->pktsup>>20;\r
+ total_pktup += mpkts;\r
+ if(mpkts == 0)\r
+ {\r
+ mpkts = 1; /* prevent divide by zero*/\r
+ }\r
+ fprintf(f,"<td style=\"text-align: right\"><span style=\"color: gray\">%d</span>", ip->upload/mpkts);\r
+ if(use_jquery_popups)\r
+ {\r
+ fprintf(f,"<span id=\"pktsup_%d\" style=\"display:none\">", i);\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */\r
+ {\r
+ mpkts = sharedip->pktsup>>20;\r
+ if(mpkts == 0)\r
+ {\r
+ mpkts = 1; /* prevent divide by zero*/\r
+ } \r
+ fprintf(f,"<br /><span style=\"color: gray\">%d</span>", sharedip->upload/mpkts);\r
+ }\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */\r
+ {\r
+ mpkts = sharedip->pktsup>>20;\r
+ if(mpkts == 0)\r
+ {\r
+ mpkts = 1; /* prevent divide by zero*/\r
+ } \r
+ fprintf(f,"<br /><span style=\"color: gray\">%d</span>", sharedip->upload/mpkts);\r
+ }\r
+ fputs("</span>\n",f);\r
+ }\r
+ fputs("</td>\n",f);\r
+\r
+/*\r
if(qos_proxy)\r
{\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
+*/\r
+ /* download ---------------------------------------- */\r
+ fprintf(f,"<td style=\"text-align: right\">%Lu", ip->direct);\r
if(use_jquery_popups)\r
{\r
- fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">", i);\r
+ fprintf(f,"<span id=\"download_%d\" style=\"display:none\">", i);\r
for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */\r
{\r
- fprintf(f,"<br />%Lu", sharedip->upload);\r
+ fprintf(f,"<br />%Lu", sharedip->direct);\r
}\r
for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */\r
{\r
- fprintf(f,"<br />%Lu", sharedip->upload);\r
+ fprintf(f,"<br />%Lu", sharedip->direct);\r
+ }\r
+ fputs("</span>\n",f);\r
+ }\r
+ fputs("</td>\n",f);\r
+\r
+ /* pkts down ---------------------------------------- */\r
+ mpkts = ip->pktsdown>>20;\r
+ total_pktdown += mpkts;\r
+ if(mpkts == 0)\r
+ {\r
+ mpkts = 1; /* prevent divide by zero*/\r
+ }\r
+ fprintf(f,"<td style=\"text-align: right\"><span style=\"color: gray\">%d</span>", ip->direct/mpkts);\r
+ if(use_jquery_popups)\r
+ {\r
+ fprintf(f,"<span id=\"pktsdown_%d\" style=\"display:none\">", i);\r
+ for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */\r
+ {\r
+ mpkts = sharedip->pktsdown>>20;\r
+ if(mpkts == 0)\r
+ {\r
+ mpkts = 1; /* prevent divide by zero*/\r
+ } \r
+ fprintf(f,"<br /><span style=\"color: gray\">%d</span>", sharedip->direct/mpkts);\r
+ }\r
+ for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */\r
+ {\r
+ mpkts = sharedip->pktsdown>>20;\r
+ if(mpkts == 0)\r
+ {\r
+ mpkts = 1; /* prevent divide by zero*/\r
+ } \r
+ fprintf(f,"<br /><span style=\"color: gray\">%d</span>", sharedip->direct/mpkts);\r
}\r
fputs("</span>\n",f);\r
}\r
}\r
}\r
}\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", \r
- total_traffic, total_direct);\r
+ fprintf(f, "</tbody><thead><tr>\n\\r
+<th colspan=\"5\" style=\"text-align: left\">%d CLASSES</th>", i);\r
+ fprintf(f, "<th style=\"text-align: right\">%Lu</th><th style=\"text-align: right\">%Lu</th>\\r
+<th style=\"text-align: right\">%d</th>\n",\r
+ total_traffic, total_upload, total_pktup/i);\r
+/*\r
if(qos_proxy)\r
{\r
fprintf(f," <th style=\"text-align: right\">%Lu</th>\n", total_proxy);\r
}\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",\r
+*/\r
+ fprintf(f, "<th style=\"text-align: right\">%Lu</th><th style=\"text-align: right\">%d</th>",\r
+ total_direct, total_pktdown/i);\r
+ fprintf(f, "<th colspan=\"6\"><span style=\"color:red\">LIMIT %dx</span> \\r
+<span style=\"color:brown\">LOW-PRIO %dx</span></th></tr>\n</thead></table>\n",\r
limit_count, prio_count);\r
\r
if(ip6prefix)\r
\r
perc6=(double)(bytes6)/(bytes4+bytes6)*100;\r
fputs("<p><table class=\"decorated last\"><caption>IP protocols usage</caption>\n",f);\r
- fprintf(f, "%s<td>Total %d IPv4 (addreses)</td><td style=\"text-align: right\">%Lu MB (%.2f %%)</td><td style=\"text-align: right\">%Lu packets (%.2f %%)</td></tr>\n",\r
+ fprintf(f, "%s<td>Total %d IPv4 addreses</td><td style=\"text-align: right\">%Lu MB (%.2f %%)</td><td style=\"text-align: right\">%Lu packets (%.2f %%)</td></tr>\n",\r
tr_odd_even(), count4, bytes4, (double)(bytes4)/(bytes4+bytes6)*100, pkts4, (float)(100*pkts4)/(pkts4+pkts6));\r
- fprintf(f, "%s<td>Total %d IPv6 (/64 ranges)</td><td style=\"text-align: right\">%Lu MB (%.2f %%)</td><td style=\"text-align: right\">%Lu packets (%.2f %%)</td></tr>\n",\r
+ fprintf(f, "%s<td>Total %d IPv6 /64 ranges</td><td style=\"text-align: right\">%Lu MB (%.2f %%)</td><td style=\"text-align: right\">%Lu packets (%.2f %%)</td></tr>\n",\r
tr_odd_even(), count6, bytes6, perc6, pkts6, (float)(100*pkts6)/(pkts4+pkts6));\r
fputs("</table></p>\n", f);\r
}\r
iplog=fopen(str,"a");\r
if(iplog)\r
{\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\tIPv6 %Lu\t%.2f %%\t%s",\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\tIPv6 %Lu M\t%.2f %%\t%s",\r
time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, \r
active_classes, total_traffic, i, limit_count, prio_count,\r
bytes6, perc6, d); /* d = date*/\r
GIT.Harvie.CZ / svn / Prometheus-QoS / .git / blobdiff