X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=htmlandlogs.c;h=431d044bf3d36fb53ada3ae48340152c5744c613;hp=f16580adbb597adf97499255bc9280316255ce89;hb=HEAD;hpb=ca6f7e80f4ce05259df01ec965beb7a4907b8540

diff --git a/htmlandlogs.c b/htmlandlogs.c
index f16580a..431d044 100644
--- a/htmlandlogs.c
+++ b/htmlandlogs.c
@@ -1,3 +1,5 @@
+/* Modified by: xChaos, 20131119 */
+
 #include "cll1-0.6.2.h"
 #include "ipstruct.h"
 #define STRLEN 512
@@ -12,15 +14,15 @@ extern const char *version;
 extern const char *stats_html_signature;
 extern char *jquery_url;
 extern int keywordcount;
-extern long long int line;
 extern int dry_run;
 extern int qos_proxy;
 extern char *title;
 extern char *log_url;
-extern int found_lmsid;
+extern int found_code;
 extern char *lms_url;
 extern char *log_dir;
 extern char *ip6prefix;
+extern int traffic_detected;
 
 const char *tr_odd_even(void);
 /* implemented in prometheus.c, shared with parselogs.c */
@@ -40,9 +42,9 @@ void append_log(struct IP *self) /*using global variables*/
  f = fopen(str, "a");
  if(f > 0)
  {
-  fprintf(f, "%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",
+  fprintf(f, "%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%s\t%s",
              time(NULL), self->name, self->traffic, self->direct, self->proxy,
-             self->upload, self->min, self->max, self->desired, self->lmsid, d); /* d = date*/
+             self->upload, self->min, self->max, self->desired, self->code, d); /* d = date*/
   fclose(f);
  }
  else
@@ -98,19 +100,19 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
    count++; 
   }
 #ifdef DEBUG
-   printf("Total groups: %d Total bandwidth requested: %d kb/s\nAGGREGATION: 1/%d\n",
-          count, i, i/line);
+   printf("Total groups: %d Total bandwidth requested: %d kb/s\n",
+          count, i, i);
 #endif
    fprintf(f,"</tr></tbody>\n\
 <thead><tr>\n\
-<th colspan=\"2\" style=\"text-align: left\">Line %Ld kb/s</td>",line);
+<th colspan=\"2\" style=\"text-align: left\"></td>");
    fprintf(f,"<th style=\"text-align: right\">%d</td><th style=\"text-align: right\">%d kb/s</td>",total,i);
 
    for_each(keyword, keywords) if(keyword->ip_count)
    {
     fprintf(f,"<th style=\"text-align: right\">%d IPs</th>",keyword->ip_count);
    }
-   fprintf(f,"</tr><tr><th colspan=\"4\">Aggregation 1/%d</th>\n", (int)(0.5+i/line));
+   fprintf(f,"</tr><tr><th colspan=\"4\"></th>\n");
    fprintf(f,"<th colspan=\"%d\">%d traffic classes</th></tr>\n", keywordcount, total);
 
    fputs("</thead></table>\n",f);
@@ -123,30 +125,51 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
  i=0;
  if(f > 0)
  {
-  unsigned long long total_traffic=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;
-  int active_classes=0;
-  int colspan=12;
-  struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums=NULL;
-  int limit_count=0, prio_count=0;
-  int popup_button=0;
-
+  unsigned long long total_traffic = 1 /* prevent divide by zero */ , total_direct=0, total_proxy=0, total_upload=0, tmp_sum = 0;
+  unsigned long long total_pktup = 0, total_pktdown = 0;
+  int active_classes = 0;
+//  int colspan = 14;
+  struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums = NULL;
+  int agreg_count = 0, limit_count = 0, prio_count = 0;
+  int popup_button = 0;
+  /* IPv6 vs. IPv4 stats */
+  unsigned long long pkts4 = 1, pkts6 = 1 /*prevent divide by zero */, bytes4 = 0, bytes6 = 0;
+  int count4 = 0, count6 = 0;
+  int mpkts;
+  double perc6;
+
+/*
   if(qos_proxy)
   {
    colspan++;
   }
-  
+*/  
+  if(use_jquery_popups)
+  {
+    fprintf(f,"<script type=\"text/javascript\">\
+function show_section(n) {\
+$(\'#sharing_\'+n).show();\
+$(\'#download_'+n).show();\
+$(\'#pktsdown_\'+n).show();\
+$(\'#upload_'+n).show();\
+$(\'#pktsup_\'+n).show();\
+} </script>");
+  }
+
   fprintf(f,"<p><table class=\"decorated last\">\n<caption>%s",title);
   fprintf(f," (%s)</caption>\n", d);
   fputs("<thead><tr>\n<th colspan=\"3\">&nbsp;</th>\n",f);
-  fputs("<th style=\"text-align: right\">credit</th>\n\
+  fputs("<th style=\"text-align: right\">cred.</th>\n\
 <th style=\"text-align: right\">FUP</th>\n\
 <th style=\"text-align: right\">total</th>\n\
-<th style=\"text-align: right\">down</th>\n",f);
+<th style=\"text-align: center\" colspan=\"2\">upload</th>\n",f);
+/*
   if(qos_proxy)
   {
    fputs("<th style=\"text-align: right\">proxy</th>\n",f);
   }
-  fputs("<th style=\"text-align: right\">up</th>\n\
+*/
+  fputs("<th style=\"text-align: center\" colspan=\"2\">download</th>\n\
 <th style=\"text-align: right\">min</th>\n\
 <th style=\"text-align: right\">max</th>\n\
 <th style=\"text-align: right\">limit</th>\n\
@@ -159,11 +182,13 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
 <th style=\"text-align: right\">MB</th>\n\
 <th style=\"text-align: right\">MB</th>\n\
 <th style=\"text-align: right\">MB</th>\n\
+<th style=\"text-align: right\">pkt</th>\n\
 <th style=\"text-align: right\">MB</th>\n\
+<th style=\"text-align: right\">pkt</th>\n\
 <th style=\"text-align: right\">kb/s</th>\n\
 <th style=\"text-align: right\">kb/s</th>\n\
 <th style=\"text-align: right\">kb/s</th>\n\
-<th>prio</th>\n\
+<th>!</th>\n\
 </tr></thead><tbody>\n",f);	
 
   row_odd_even = 0;
@@ -172,7 +197,13 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
    char *f1="", *f2="";
    i++;
 
-   if(ip->max < ip->desired) 
+   if(ip->aggregated > 1)
+   {
+    f1 = "<span style=\"color:green\">";
+    f2 = "</span>";   
+    agreg_count++;
+   }
+   else if(ip->max < ip->desired) 
    {
     f1 = "<span style=\"color:red\">";
     f2 = "</span>"; 
@@ -189,7 +220,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); 
 #endif
    /* hostnames -------------------------------------- */
-   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", 
+   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", 
               tr_odd_even(), ip->name, i, log_url, ip->name, ip->name);
 
    if(use_jquery_popups)
@@ -206,86 +238,156 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
 
      for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */
      {
-      fprintf(f, "<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s/64</a>\n", 
-                 log_url, sharedip->addr, sharedip->addr);
+      fprintf(f, "<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s/%d</a>\n", 
+                 log_url, sharedip->addr, sharedip->addr, sharedip->mask);
       popup_button++;
      }
 
      fputs("</span>\n",f);
      if(popup_button)
      {
-      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>",
-                 i, i, i, popup_button);
+      fprintf(f, "<span>[<a class=\"blue\" href=\"#\" \
+onClick=\"$(this).parent().hide();show_section(\'%d\');return(false);\" \
+style=\"cursor: pointer;\">+%d</a>]</span>",
+                 i, popup_button);
      }
    }
    fputs("</td>\n",f);
    /* ----------------------------------------------- */
 
-   if(found_lmsid)
+   if(found_code)
    {
     fputs("<td style=\"text-align: right\">",f);
-    if(ip->lmsid > 0)
+    if(ip->code[0])
     {
-     fprintf(f,"<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);
+     fprintf(f, "<a class=\"blue\" target=\"_blank\" href=\"%s%s\">%s</a>\n",
+                lms_url, ip->code, ip->code);
     }
-    else if(ip->lmsid == 0)
+    else if(ip->code[0] == 0)
     {
-     fputs("-------",f);
+     fputs("------",f);
     }
     fputs("</td>\n",f);
    }
    fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->credit);
    fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%Lu</span></td>",
              ip->keyword->html_color, ip->realquota);
-   fprintf(f,"<td style=\"text-align: right\">%s%Lu%s", f1, ip->traffic, f2);
+   fprintf(f,"<td style=\"text-align: right\">%s%Lu%s</td>", f1, ip->traffic, f2);
 
-   /* download --------------------------------------- */
-   fprintf(f,"</td><td style=\"text-align: right\">%Lu", ip->direct);
+   /* upload --------------------------------------- */
+   fprintf(f,"<td style=\"text-align: right\">%Lu", ip->upload);
    if(use_jquery_popups)
    {
-     fprintf(f,"<span id=\"download_%d\" style=\"display:none\">", i);
+     fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">", i);
      for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */
      {
-      fprintf(f,"<br />%Lu", sharedip->direct);
+      fprintf(f,"<br />%Lu", sharedip->upload);
      }
      for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */
      {
-      fprintf(f,"<br />%Lu", sharedip->direct);
+      fprintf(f,"<br />%Lu", sharedip->upload);
      }
      fputs("</span>\n",f);
    }
    fputs("</td>\n",f);
-   /* ----------------------------------------------- */
 
+   /* pkts up ----------------------------------- */
+   mpkts = ip->pktsup>>20;
+   total_pktup += mpkts;
+   if(mpkts == 0)
+   {
+    mpkts = 1; /* prevent divide by zero*/
+   }
+   fprintf(f,"<td style=\"text-align: right\"><span style=\"color: gray\">%d</span>", ip->upload/mpkts);
+   if(use_jquery_popups)
+   {
+     fprintf(f,"<span id=\"pktsup_%d\" style=\"display:none\">", i);
+     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */
+     {
+      mpkts = sharedip->pktsup>>20;
+      if(mpkts == 0)
+      {
+       mpkts = 1; /* prevent divide by zero*/
+      }   
+      fprintf(f,"<br /><span style=\"color: gray\">%d</span>", sharedip->upload/mpkts);
+     }
+     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */
+     {
+      mpkts = sharedip->pktsup>>20;
+      if(mpkts == 0)
+      {
+       mpkts = 1; /* prevent divide by zero*/
+      }   
+      fprintf(f,"<br /><span style=\"color: gray\">%d</span>", sharedip->upload/mpkts);
+     }
+     fputs("</span>\n",f);
+   }
+   fputs("</td>\n",f);
+
+/*
    if(qos_proxy)
    {
     fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->proxy);
    }
-   /* upload ---------------------------------------- */
-   fprintf(f,"<td style=\"text-align: right\">%Lu", ip->upload);
+*/
+   /* download ---------------------------------------- */
+   fprintf(f,"<td style=\"text-align: right\">%Lu", ip->direct);
    if(use_jquery_popups)
    {
-     fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">", i);
+     fprintf(f,"<span id=\"download_%d\" style=\"display:none\">", i);
      for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */
      {
-      fprintf(f,"<br />%Lu", sharedip->upload);
+      fprintf(f,"<br />%Lu", sharedip->direct);
      }
      for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */
      {
-      fprintf(f,"<br />%Lu", sharedip->upload);
+      fprintf(f,"<br />%Lu", sharedip->direct);
+     }
+     fputs("</span>\n",f);
+   }
+   fputs("</td>\n",f);
+
+   /* pkts down ---------------------------------------- */
+   mpkts = ip->pktsdown>>20;
+   total_pktdown += mpkts;
+   if(mpkts == 0)
+   {
+    mpkts = 1; /* prevent divide by zero*/
+   }
+   fprintf(f,"<td style=\"text-align: right\"><span style=\"color: gray\">%d</span>", ip->direct/mpkts);
+   if(use_jquery_popups)
+   {
+     fprintf(f,"<span id=\"pktsdown_%d\" style=\"display:none\">", i);
+     for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */
+     {
+      mpkts = sharedip->pktsdown>>20;
+      if(mpkts == 0)
+      {
+       mpkts = 1; /* prevent divide by zero*/
+      }   
+      fprintf(f,"<br /><span style=\"color: gray\">%d</span>", sharedip->direct/mpkts);
+     }
+     for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */
+     {
+      mpkts = sharedip->pktsdown>>20;
+      if(mpkts == 0)
+      {
+       mpkts = 1; /* prevent divide by zero*/
+      }   
+      fprintf(f,"<br /><span style=\"color: gray\">%d</span>", sharedip->direct/mpkts);
      }
      fputs("</span>\n",f);
    }
    fputs("</td>\n",f);
    /* ----------------------------------------------- */
 
-   fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
+   fprintf(f, "<td style=\"text-align: right\">%d</td>\n\
 <td style=\"text-align: right\">%d</td>\n\
 <td style=\"text-align: right\">%s%d%s</td>\n\
 <td>%s%d%s</td></tr>\n",
-             ip->min, ip->desired, 
-             f1, ip->max, f2, 
-             f1, ip->prio, f2);
+              ip->min, ip->desired, 
+              f1, ip->max, f2, 
+              f1, ip->prio, f2);
 
    total_traffic+=ip->traffic;
    total_direct+=ip->direct;
@@ -301,7 +403,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
     insert(sum,sums,order_by,i);
    }
 
-   if(!just_preview)
+   if(!just_preview && traffic_detected)
    {
     append_log(ip);
     for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))
@@ -309,40 +411,55 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
      append_log(sharedip);
     }
    }
+   else
+   {
+    printf(".");
+   }
   }
-  fprintf(f,"</tbody><thead><tr>\n\
-<th colspan=\"%d\" style=\"text-align: left\">%d CLASSES</th>", colspan-7, i);
-  fprintf(f,"<th style=\"text-align: right\">%Lu</th><th style=\"text-align: right\">%Lu</th>\n", total_traffic, total_direct);
+  fprintf(f, "</tbody><thead><tr>\n\
+<th colspan=\"5\" style=\"text-align: left\">%d CLASSES</th>", i);
+  fprintf(f, "<th style=\"text-align: right\">%Lu</th><th style=\"text-align: right\">%Lu</th>\
+<th style=\"text-align: right\">%d</th>\n",
+             total_traffic, total_upload, total_pktup/i);
+/*
   if(qos_proxy)
   {
-   fprintf(f,"<th style=\"text-align: right\">%Lu</th>\n", total_proxy);
+   fprintf(f," <th style=\"text-align: right\">%Lu</th>\n", total_proxy);
   }
-  fprintf(f,"<th style=\"text-align: right\">%Lu</th>", total_upload);
-  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);
+*/
+  fprintf(f, "<th style=\"text-align: right\">%Lu</th><th style=\"text-align: right\">%d</th>",
+             total_direct, total_pktdown/i);
+  fprintf(f, "<th colspan=\"6\">\
+<span style=\"color:green\">AGR %dx</span> \
+<span style=\"color:red\">FUP %dx</span> \
+<span style=\"color:brown\">PRIO %dx</span></th></tr>\n</thead></table>\n",
+             agreg_count, limit_count, prio_count);
 
   if(ip6prefix)
-  {
-   unsigned long long pkts4 =0, pkts6 = 0, bytes4 = 0, bytes6 = 0;
+  { 
    for_each(ip, ips)
    { 
     if(ip->v6)
     {
-     bytes6 += ip->traffic;
-     pkts6 += ip->pktsdown+ip->pktsup;
+     bytes6 += ip->upload + ip->direct;
+     pkts6 += ip->pktsdown + ip->pktsup;
+     count6++;
     }
     else
     {
-     bytes4 += ip->traffic;
-     pkts4 += ip->pktsdown+ip->pktsup;
+     bytes4 += ip->upload + ip->direct;
+     pkts4 += ip->pktsdown + ip->pktsup;
+     count4++;
     }
    }
 
+   perc6=(double)(bytes6)/(bytes4+bytes6)*100;
    fputs("<p><table class=\"decorated last\"><caption>IP protocols usage</caption>\n",f);
-   fprintf(f, "%s<td>Total IPv4</td><td style=\"text-align: right\">%Lu MB (%.2f %%)</td><td style=\"text-align: right\">%Lu packets (%d %%)</td></tr>\n",
-              tr_odd_even(), bytes4, (float)(100*bytes4)/(bytes4+bytes6), pkts4, (float)(100*pkts4)/(pkts4+pkts6));
-   fprintf(f, "%s<td>Total IPv6</td><td style=\"text-align: right\">%Lu MB (%.2f %%)</td><td style=\"text-align: right\">%Lu packets (%d %%)</td></tr>\n",
-              tr_odd_even(), bytes6, (float)(100*bytes6)/(bytes4+bytes6), pkts6, (float)(100*pkts6)/(pkts4+pkts6));
-   fputs("</table>\n", f);
+   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",
+              tr_odd_even(), count4, bytes4, (double)(bytes4)/(bytes4+bytes6)*100, pkts4, (float)(100*pkts4)/(pkts4+pkts6));
+   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",
+              tr_odd_even(), count6, bytes6, perc6, pkts6, (float)(100*pkts6)/(pkts4+pkts6));
+   fputs("</table></p>\n", f);
   }
 
   row_odd_even = 0;
@@ -359,7 +476,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
 <th colspan=\"2\" style=\"text-align: center\">Data transfers</th>\n\
 </tr></thead><tbody>\n",f);
 
-   if_exists(sum,sums,sum->l>=total_traffic/4)
+   if_exists(sum,sums,sum->l >= total_traffic/4)
    {
     fprintf(f,"%s<td>Top 25%% of traffic</td>\n", tr_odd_even());
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
@@ -369,7 +486,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
               sum->i, (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);
    }
    
-   if_exists(sum,sums,sum->i==10)
+   if_exists(sum,sums,sum->i == 10)
    {
     fprintf(f,"%s<td>Top 10 downloaders</td>\n", tr_odd_even());
     fprintf(f,"<td style=\"text-align: right\"><strong>10</strong></td>\n\
@@ -379,7 +496,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
               (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);
    }
 
-   if_exists(sum,sums,sum->l>=total_traffic/2)
+   if_exists(sum,sums,sum->l >= total_traffic/2)
    {
     fprintf(f,"%s<td>Top 50%% of traffic</td>\n", tr_odd_even());
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
@@ -389,7 +506,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
               sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
 
-   if_exists(sum,sums,sum->l>=4*total_traffic/5)
+   if_exists(sum,sums,sum->l >= 4*total_traffic/5)
    {
     fprintf(f,"%s<td>Top 80%% of traffic</td>\n", tr_odd_even());
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
@@ -399,7 +516,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
               sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
 
-   if_exists(sum,sums,sum->i>=(active_classes+1)/5)
+   if_exists(sum,sums,sum->i >= (active_classes+1)/5)
    {
     fprintf(f,"%s<td>Top 20%% downloaders</td>\n", tr_odd_even());
     top20_count=sum->i;
@@ -413,7 +530,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
               top20_count,top20_perc1,top20_sum,top20_perc2);
    }
 
-   if_exists(sum,sums,sum->i>=(active_classes+1)/4)
+   if_exists(sum,sums,sum->i >= (active_classes+1)/4)
    {
     fprintf(f,"%s<td>Top 25%% downloaders</td>\n", tr_odd_even());
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
@@ -433,7 +550,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
               sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
 
-   if_exists(sum,sums,sum->i>=4*(active_classes+1)/5)
+   if_exists(sum,sums,sum->i >= 4*(active_classes+1)/5)
    {
     fprintf(f,"%s<td>Top 80%% downloaders</td>\n", tr_odd_even());
     fprintf(f,"<td style=\"text-align: right\">%d</td>\n\
@@ -448,7 +565,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
 <th style=\"text-align: right\">100 %%</th>\n\
 <th style=\"text-align: right\">%Lu MB</th>\n\
 <th style=\"text-align: right\">100 %%</th></tr>\n",active_classes,total_traffic);
-   fputs("</thead></table>\n", f);
+   fputs("</thead></table></p>\n", f);
 
    /* write basic ERP data to log directory */
    if(!just_preview)
@@ -458,9 +575,10 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
     iplog=fopen(str,"a");
     if(iplog)
     {
-     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",
-                   time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, 
-                   active_classes, total_traffic, i, limit_count, prio_count, d); /* d = date*/
+     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",
+                    time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, 
+                    active_classes, total_traffic, i, limit_count, prio_count,
+                    bytes6, perc6, d); /* d = date*/
      fclose(iplog);
     }
     else