-b Boot mode

[svn/Prometheus-QoS/.git] / htmlandlogs.c

diff --git a/htmlandlogs.c b/htmlandlogs.c
index b6f9cb66602c080c23b220dd177cd2076a95df98..431d044bf3d36fb53ada3ae48340152c5744c613 100644 (file)
--- a/htmlandlogs.c
+++ b/htmlandlogs.c
@@ -18,10 +18,11 @@ extern int dry_run;
 extern int qos_proxy;\r
 extern char *title;\r
 extern char *log_url;\r
-extern int found_lmsid;\r
+extern int found_code;\r
 extern char *lms_url;\r
 extern char *log_dir;\r
 extern char *ip6prefix;\r
+extern int traffic_detected;\r
 \r
 const char *tr_odd_even(void);\r
 /* implemented in prometheus.c, shared with parselogs.c */\r
@@ -41,9 +42,9 @@ void append_log(struct IP *self) /*using global variables*/
  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
+  fprintf(f, "%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%s\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
+             self->upload, self->min, self->max, self->desired, self->code, d); /* d = date*/\r
   fclose(f);\r
  }\r
  else\r
@@ -124,7 +125,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
  i=0;\r
  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_traffic = 1 /* prevent divide by zero */ , 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 = 14;\r
@@ -132,7 +133,7 @@ void write_htmlandlogs(char *html, char *d, int total, int just_preview)
   int agreg_count = 0, 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
+  unsigned long long pkts4 = 1, pkts6 = 1 /*prevent divide by zero */, bytes4 = 0, bytes6 = 0;\r
   int count4 = 0, count6 = 0;\r
   int mpkts;\r
   double perc6;\r
@@ -254,15 +255,15 @@ style=\"cursor: pointer;\">+%d</a>]</span>",
    fputs("</td>\n",f);\r
    /* ----------------------------------------------- */\r
 \r
-   if(found_lmsid)\r
+   if(found_code)\r
    {\r
     fputs("<td style=\"text-align: right\">",f);\r
-    if(ip->lmsid > 0)\r
+    if(ip->code[0])\r
     {\r
-     fprintf(f, "<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n",\r
-                lms_url, ip->lmsid, ip->lmsid);\r
+     fprintf(f, "<a class=\"blue\" target=\"_blank\" href=\"%s%s\">%s</a>\n",\r
+                lms_url, ip->code, ip->code);\r
     }\r
-    else if(ip->lmsid == 0)\r
+    else if(ip->code[0] == 0)\r
     {\r
      fputs("------",f);\r
     }\r
@@ -402,7 +403,7 @@ style=\"cursor: pointer;\">+%d</a>]</span>",
     insert(sum,sums,order_by,i);\r
    }\r
 \r
-   if(!just_preview)\r
+   if(!just_preview && traffic_detected)\r
    {\r
     append_log(ip);\r
     for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
@@ -410,6 +411,10 @@ style=\"cursor: pointer;\">+%d</a>]</span>",
      append_log(sharedip);\r
     }\r
    }\r
+   else\r
+   {\r
+    printf(".");\r
+   }\r
   }\r
   fprintf(f, "</tbody><thead><tr>\n\\r
 <th colspan=\"5\" style=\"text-align: left\">%d CLASSES</th>", i);\r