iptables --burst-limit added + some preliminary packet statistics in html output...

git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@235 251d49ef-1d17-4917-a970-b30cf55b089b

diff --git a/htmlandlogs.c b/htmlandlogs.c
index c6d16120dd6da25646555ddcdd2f7e0a1eb295a4..39a4286abd51192fbcfda7e3542588be5d66627d 100644 (file)
--- a/htmlandlogs.c
+++ b/htmlandlogs.c
@@ -1,3 +1,5 @@
+/* Modified by: xChaos, 20131119 */\r
+\r
 #include "cll1-0.6.2.h"\r
 #include "ipstruct.h"\r
 #define STRLEN 512\r
@@ -124,33 +126,50 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
  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\">&nbsp;</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
@@ -163,11 +182,13 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
 <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
@@ -193,7 +214,8 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
    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
@@ -218,8 +240,10 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
      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
@@ -230,7 +254,8 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
     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
@@ -241,42 +266,109 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
    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
@@ -314,16 +406,21 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
     }\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

diff --git a/prometheus.c b/prometheus.c
index 279da9b75d28b4fd245b28ed4e6165eaae86fc91..c3ae02cd9bc88c60708f2441afa5283c4cb9fc64 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,7 +7,7 @@
 /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */\r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
-/* Modified by: xChaos, 20131118\r
+/* Modified by: xChaos, 20131119\r
                  ludva, 20080415\r
  \r
    Prometheus QoS is free software; you can redistribute it and/or\r
@@ -1130,7 +1130,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   /* packet limits - this will be optional in future, hardcoded for now */\r
   if(ip->pps_limit)\r
   {\r
-   sprintf(limit_pkts, "-m limit --limit %d/s ", ip->pps_limit);\r
+   sprintf(limit_pkts, "-m limit --limit %d/s --limit-burst %d ", \r
+                       ip->pps_limit, ip->pps_limit);\r
   }\r
   else\r
   {\r