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

diff --git a/htmlandlogs.c b/htmlandlogs.c
index 8bcfe71..c0d5648 100644
--- a/htmlandlogs.c
+++ b/htmlandlogs.c
@@ -30,14 +30,18 @@ void append_log(struct IP *self) /*using global variables*/
  FILE *f; 
 
  date(d); /* this is typical cll1.h macro - prints current date */ 
- string(str,STRLEN); 
- sprintf(str,"%s/%s.log", log_dir, self->name);
- f=fopen(str,"a");
+ string(str, STRLEN); 
+ sprintf(str, "%s/%s.log", log_dir, self->name);
+
+ /*-----------------------------------------------------------------*/
+ printf("Writing traffic log %s ...\n", str);
+ /*-----------------------------------------------------------------*/
+ 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",
-            time(NULL), self->name, self->traffic, self->direct, self->proxy,
-            self->upload, self->min, self->max, self->desired, self->lmsid, d); /* d = date*/
+  fprintf(f, "%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\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*/
   fclose(f);
  }
  else
@@ -191,14 +195,14 @@ 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) && !strchr(sharedip->addr,':')) /* IPv4 only */
+     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* 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 */
+     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</a>\n", log_url, sharedip->name, sharedip->addr);
+      fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s/64</a>\n", log_url, sharedip->addr, sharedip->addr);
       popup_button++;
      }
      fputs("</span>\n",f);
@@ -234,11 +238,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) && !strchr(sharedip->addr,':')) /* IPv4 only */
+     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */
      {
       fprintf(f,"<br />%Lu", sharedip->direct);
      }
-     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !strchr(sharedip->addr,'.')) /* IPv6 only */
+     for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */
      {
       fprintf(f,"<br />%Lu", sharedip->direct);
      }
@@ -256,11 +260,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) && !strchr(sharedip->addr,':')) /* IPv4 only */
+     for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */
      {
       fprintf(f,"<br />%Lu", sharedip->upload);
      }
-     for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && !strchr(sharedip->addr,'.')) /* IPv6 only */
+     for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */
      {
       fprintf(f,"<br />%Lu", sharedip->upload);
      }