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

diff --git a/htmlandlogs.c b/htmlandlogs.c
index 39a4286..431d044 100644
--- a/htmlandlogs.c
+++ b/htmlandlogs.c
@@ -14,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 */
@@ -42,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
@@ -100,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);
@@ -125,15 +125,15 @@ 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;
+  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 limit_count = 0, prio_count = 0;
+  int agreg_count = 0, limit_count = 0, prio_count = 0;
   int popup_button = 0;
   /* IPv6 vs. IPv4 stats */
-  unsigned long long pkts4 =0, pkts6 = 0, bytes4 = 0, bytes6 = 0;
+  unsigned long long pkts4 = 1, pkts6 = 1 /*prevent divide by zero */, bytes4 = 0, bytes6 = 0;
   int count4 = 0, count6 = 0;
   int mpkts;
   double perc6;
@@ -197,7 +197,13 @@ $(\'#pktsup_\'+n).show();\
    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>"; 
@@ -232,8 +238,8 @@ $(\'#pktsup_\'+n).show();\
 
      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++;
      }
 
@@ -249,17 +255,17 @@ style=\"cursor: pointer;\">+%d</a>]</span>",
    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);
    }
@@ -397,7 +403,7 @@ style=\"cursor: pointer;\">+%d</a>]</span>",
     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))
@@ -405,6 +411,10 @@ style=\"cursor: pointer;\">+%d</a>]</span>",
      append_log(sharedip);
     }
    }
+   else
+   {
+    printf(".");
+   }
   }
   fprintf(f, "</tbody><thead><tr>\n\
 <th colspan=\"5\" style=\"text-align: left\">%d CLASSES</th>", i);
@@ -419,9 +429,11 @@ style=\"cursor: pointer;\">+%d</a>]</span>",
 */
   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: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 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)
   {