X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=htmlandlogs.c;h=8bcfe71f2e36832e0633eae6ac79e895ab543a02;hp=f624a48442c56c3d508c1b01f149de98f8b9d061;hb=f64d54310ae39276c552b80183ae2320789bb4be;hpb=9a56ab25128074e581fa5f69bac8afa2fb939c82

diff --git a/htmlandlogs.c b/htmlandlogs.c
index f624a48..8bcfe71 100644
--- a/htmlandlogs.c
+++ b/htmlandlogs.c
@@ -50,7 +50,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
 {
  int i;
  char *str;
- FILE *f=fopen(html,"w");
+ FILE *f=fopen(html, "w");
 
  string(str,STRLEN); 
  if(f > 0)
@@ -58,10 +58,6 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
   int count=1;
   i=0;
 
-  /*-----------------------------------------------------------------*/
-  printf("Writing statistics summary into HTML page %s ...\n", html);
-  /*-----------------------------------------------------------------*/
-
   if(use_jquery_popups)
   {
    fprintf(f,"<script type=\"text/javascript\" src=\"%s\"></script>\n", jquery_url);
@@ -195,11 +191,16 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
    {
      fprintf(f,"<span id=\"sharing_%d\" style=\"display:none\">",i);
      popup_button=0;
-     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))
+     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !strchr(sharedip->addr,':')) /* IPv4 only */
      {
       fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);
       popup_button++;
      }
+     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !strchr(sharedip->addr,'.')) /* IPv6 only */
+     {
+      fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->addr);
+      popup_button++;
+     }
      fputs("</span>\n",f);
      if(popup_button)
      {
@@ -225,8 +226,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
    }
    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->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));
+             ip->keyword->html_color, ip->realquota);
    fprintf(f,"<td style=\"text-align: right\">%s%Lu%s", f1, ip->traffic, f2);
 
    /* download --------------------------------------- */
@@ -234,7 +234,11 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
    if(use_jquery_popups)
    {
      fprintf(f,"<span id=\"download_%d\" style=\"display:none\">",i);
-     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))
+     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !strchr(sharedip->addr,':')) /* IPv4 only */
+     {
+      fprintf(f,"<br />%Lu", sharedip->direct);
+     }
+     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !strchr(sharedip->addr,'.')) /* IPv6 only */
      {
       fprintf(f,"<br />%Lu", sharedip->direct);
      }
@@ -252,7 +256,11 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
    if(use_jquery_popups)
    {
      fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">",i);
-     for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))
+     for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && !strchr(sharedip->addr,':')) /* IPv4 only */
+     {
+      fprintf(f,"<br />%Lu", sharedip->upload);
+     }
+     for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && !strchr(sharedip->addr,'.')) /* IPv6 only */
      {
       fprintf(f,"<br />%Lu", sharedip->upload);
      }