From: xchaos <xchaos@251d49ef-1d17-4917-a970-b30cf55b089b>
Date: Wed, 22 Jun 2016 21:27:37 +0000 (+0000)
Subject: digital-divide, total avg.speed was nonsense
X-Git-Url: https://git.harvie.cz/?a=commitdiff_plain;h=d1dd0f041b98807ce8b6dfd5d46983427d3a7f16;p=svn%2FPrometheus-QoS%2F.git

digital-divide, total avg.speed was nonsense



git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@255 251d49ef-1d17-4917-a970-b30cf55b089b
---

diff --git a/parselogs.c b/parselogs.c
index ffd82a1..7eb2319 100644
--- a/parselogs.c
+++ b/parselogs.c
@@ -163,7 +163,7 @@ void parse_ip_log(int argc, char **argv)
  f=fopen(str,"w");
  if(f > 0)
  {
-  time_t max_logged_time = 0;
+//  time_t max_logged_time = 0;
 
   fprintf(f, "<table class=\"decorated last\"><thead>\n\
 <tr><th colspan=\"2\">%s %s</th>\n\
@@ -177,11 +177,11 @@ void parse_ip_log(int argc, char **argv)
   row_odd_even = 0;
   for_each(iplog, iplogs)
   {
-   if(iplog->logged_time > max_logged_time)
+/*   if(iplog->logged_time > max_logged_time)
    {
     max_logged_time = iplog->logged_time;
    }
-
+*/
    if(iplog->traffic)
    {
     fprintf(f, "%s<td style=\"text-align: right\">%d</td>\n\
@@ -214,8 +214,8 @@ void parse_ip_log(int argc, char **argv)
 <th colspan=\"3\" style=\"text-align: left\">Total:</th>\
 <th colspan=\"2\" style=\"text-align: right\"><strong>%ld&nbsp;GB</strong></th>\
 <th style=\"text-align: right\"><strong>%Ld&nbsp;kb/s</strong></th>\
-<th style=\"text-align: right\"><strong>%Ld&nbsp;kb/s</strong></th></tr>\
-\n", total, line, (8*(total<<20))/max_logged_time/i);
+<th style=\"text-align: right\"><strong>-</strong></th></tr>\
+\n", total, line);
   fputs("</thead></table>\n", f);
 
   row_odd_even = 0;
diff --git a/prometheus.c b/prometheus.c
index f8ad197..993b185 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,7 +7,7 @@
 /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-/* Modified by: xChaos, 20151020
+/* Modified by: xChaos, 20160622
                  ludva, 20080415
  
    Prometheus QoS is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
 #include "cll1-0.6.2.h"
 #include "ipstruct.h"
 
-const char *version = "0.8.5-d";
+const char *version = "0.8.5-e";
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 /* Versions: 0.8.5 is development release, 0.8.6 will be "stable"  */
@@ -307,6 +307,7 @@ void get_config(char *config_filename)
   lloption("wan-download",line);
   lloption("wan-upload",up);
   ioption("hall-of-fame-enable",hall_of_fame);
+  ioption("digital-divide-weirdness-ratio",digital_divide);
   option("hall-of-fame-title",title);
   option("hall-of-fame-filename",html);
   option("json-filename",json_traffic);