extern int found_lmsid;\r
extern char *lms_url;\r
extern char *log_dir;\r
+extern char *ip6prefix;\r
\r
const char *tr_odd_even(void);\r
/* implemented in prometheus.c, shared with parselogs.c */\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
+ string(str, STRLEN); \r
+ sprintf(str, "%s/%s.log", log_dir, self->name);\r
+\r
+ /*-----------------------------------------------------------------*/\r
+ printf("Writing traffic log %s ...\n", str);\r
+ /*-----------------------------------------------------------------*/\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
+ 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
for_each(keyword, keywords) if(keyword->ip_count)\r
{\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
+ 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=0;\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
- int active_classes=0;\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
+ 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 = 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
+ /* IPv6 vs. IPv4 stats */\r
+ unsigned long long pkts4 =0, pkts6 = 0, bytes4 = 0, bytes6 = 0;\r
+ int count4 = 0, count6 = 0;\r
+ double perc6;\r
\r
if(qos_proxy)\r
{\r
i++;\r
\r
if(ip->max < ip->desired) \r
- { \r
- f1 = "<span style=\"color:red\">"; \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
+ }\r
+ else if(ip->prio > highest_priority+1)\r
+ {\r
+ f1 = "<span style=\"color:brown\">";\r
+ f2 = "</span>";\r
prio_count++; \r
} \r
\r
\r
if(use_jquery_popups)\r
{\r
- fprintf(f,"<span id=\"sharing_%d\" style=\"display:none\">",i);\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) && !strchr(sharedip->addr,':')) /* IPv4 only */\r
+\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */\r
{\r
- fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" 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", \r
+ log_url, sharedip->name, sharedip->name);\r
popup_button++;\r
}\r
- for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !strchr(sharedip->addr,'.')) /* IPv6 only */\r
+\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */\r
{\r
- fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->addr);\r
+ fprintf(f, "<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s/64</a>\n", \r
+ log_url, sharedip->addr, sharedip->addr);\r
popup_button++;\r
}\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
+ 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
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) && !strchr(sharedip->addr,':')) /* IPv4 only */\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->direct);\r
}\r
- for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !strchr(sharedip->addr,'.')) /* IPv6 only */\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */\r
{\r
fprintf(f,"<br />%Lu", sharedip->direct);\r
}\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) && !strchr(sharedip->addr,':')) /* IPv4 only */\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->upload);\r
}\r
- for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && !strchr(sharedip->addr,'.')) /* IPv6 only */\r
+ for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */\r
{\r
fprintf(f,"<br />%Lu", sharedip->upload);\r
}\r
fputs("</td>\n",f);\r
/* ----------------------------------------------- */\r
\r
- fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\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
+ 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
}\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
+ fprintf(f, "<th style=\"text-align: right\">%Lu</th><th style=\"text-align: right\">%Lu</th>\n", \r
+ total_traffic, total_direct);\r
if(qos_proxy)\r
{\r
- fprintf(f,"<th style=\"text-align: right\">%Lu</th>\n", total_proxy);\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
+ limit_count, prio_count);\r
+\r
+ if(ip6prefix)\r
+ { \r
+ for_each(ip, ips)\r
+ { \r
+ if(ip->v6)\r
+ {\r
+ bytes6 += ip->upload + ip->direct;\r
+ pkts6 += ip->pktsdown + ip->pktsup;\r
+ count6++;\r
+ }\r
+ else\r
+ {\r
+ bytes4 += ip->upload + ip->direct;\r
+ pkts4 += ip->pktsdown + ip->pktsup;\r
+ count4++;\r
+ }\r
+ }\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
+ 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
+ tr_odd_even(), count6, bytes6, perc6, pkts6, (float)(100*pkts6)/(pkts4+pkts6));\r
+ fputs("</table></p>\n", f);\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",limit_count,prio_count);\r
\r
row_odd_even = 0;\r
if(active_classes>10)\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
+ 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>\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
+ if_exists(sum,sums,sum->i == 10)\r
{\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
(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
+ if_exists(sum,sums,sum->l >= total_traffic/2)\r
{\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
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_traffic/5)\r
+ if_exists(sum,sums,sum->l >= 4*total_traffic/5)\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
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
+ if_exists(sum,sums,sum->i >= (active_classes+1)/5)\r
{\r
fprintf(f,"%s<td>Top 20%% downloaders</td>\n", tr_odd_even());\r
top20_count=sum->i;\r
top20_count,top20_perc1,top20_sum,top20_perc2);\r
}\r
\r
- if_exists(sum,sums,sum->i>=(active_classes+1)/4)\r
+ if_exists(sum,sums,sum->i >= (active_classes+1)/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>\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
+ if_exists(sum,sums,sum->i >= 4*(active_classes+1)/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>\n\\r
<th style=\"text-align: right\">100 %%</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
+ fputs("</thead></table></p>\n", f);\r
\r
/* write basic ERP data to log directory */\r
if(!just_preview)\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\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
+ 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
+ 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
fclose(iplog);\r
}\r
else\r
GIT.Harvie.CZ / svn / Prometheus-QoS / .git / blobdiff