simple iptables based packet limiter to deflect DoS attacks on our clients

[svn/Prometheus-QoS/.git] / htmlandlogs.c

diff --git a/htmlandlogs.c b/htmlandlogs.c
index 291871ef36177b0bdb02505d10789195b79dd6df..c6d16120dd6da25646555ddcdd2f7e0a1eb295a4 100644 (file)
--- a/htmlandlogs.c
+++ b/htmlandlogs.c
@@ -346,9 +346,9 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
 \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
@@ -466,7 +466,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
     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