FILE *f; \r
\r
date(d); /* this is typical cll1.h macro - prints current date */ \r
- string(str,STRLEN); \r
- sprintf(str,"%s/%s.log", log_dir, self->name);\r
- f=fopen(str,"a");\r
+ string(str, STRLEN); \r
+ sprintf(str, "%s/%s.log", log_dir, self->name);\r
+\r
+ /*-----------------------------------------------------------------*/\r
+ printf("Writing traffic log %s ...\n", str);\r
+ /*-----------------------------------------------------------------*/\r
+ f = fopen(str, "a");\r
if(f > 0)\r
{\r
- fprintf(f,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",\r
- time(NULL), self->name, self->traffic, self->direct, self->proxy,\r
- self->upload, self->min, self->max, self->desired, self->lmsid, d); /* d = date*/\r
+ fprintf(f, "%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",\r
+ time(NULL), self->name, self->traffic, self->direct, self->proxy,\r
+ self->upload, self->min, self->max, self->desired, self->lmsid, d); /* d = date*/\r
fclose(f);\r
}\r
else\r
{\r
int i;\r
char *str;\r
- FILE *f=fopen(html,"w");\r
+ FILE *f=fopen(html, "w");\r
\r
string(str,STRLEN); \r
if(f > 0)\r
int count=1;\r
i=0;\r
\r
- /*-----------------------------------------------------------------*/\r
- printf("Writing statistics summary into HTML page %s ...\n", html);\r
- /*-----------------------------------------------------------------*/\r
-\r
if(use_jquery_popups)\r
{\r
fprintf(f,"<script type=\"text/javascript\" src=\"%s\"></script>\n", jquery_url);\r
{\r
fprintf(f,"<span id=\"sharing_%d\" style=\"display:none\">",i);\r
popup_button=0;\r
- for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */\r
{\r
fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);\r
popup_button++;\r
}\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && sharedip->v6) /* IPv6 only */\r
+ {\r
+ fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s/64</a>\n", log_url, sharedip->addr, sharedip->addr);\r
+ popup_button++;\r
+ }\r
fputs("</span>\n",f);\r
if(popup_button)\r
{\r
if(use_jquery_popups)\r
{\r
fprintf(f,"<span id=\"download_%d\" style=\"display:none\">",i);\r
- for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
+ for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */\r
+ {\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->direct);\r
}\r
if(use_jquery_popups)\r
{\r
fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">",i);\r
- for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
+ for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing) && !sharedip->v6) /* IPv4 only */\r
+ {\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->upload);\r
}\r