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 ffd82a1e333e8d6bcf2bf46d061ae0fed9e3014d..7eb2319daf324499ba7b0d13d7e19cbb03b03906 100644 (file)
--- a/parselogs.c
+++ b/parselogs.c
@@ -163,7 +163,7 @@ void parse_ip_log(int argc, char **argv)
  f=fopen(str,"w");\r
  if(f > 0)\r
  {\r
-  time_t max_logged_time = 0;\r
+//  time_t max_logged_time = 0;\r
 \r
   fprintf(f, "<table class=\"decorated last\"><thead>\n\\r
 <tr><th colspan=\"2\">%s %s</th>\n\\r
@@ -177,11 +177,11 @@ void parse_ip_log(int argc, char **argv)
   row_odd_even = 0;\r
   for_each(iplog, iplogs)\r
   {\r
-   if(iplog->logged_time > max_logged_time)\r
+/*   if(iplog->logged_time > max_logged_time)\r
    {\r
     max_logged_time = iplog->logged_time;\r
    }\r
-\r
+*/\r
    if(iplog->traffic)\r
    {\r
     fprintf(f, "%s<td style=\"text-align: right\">%d</td>\n\\r
@@ -214,8 +214,8 @@ void parse_ip_log(int argc, char **argv)
 <th colspan=\"3\" style=\"text-align: left\">Total:</th>\\r
 <th colspan=\"2\" style=\"text-align: right\"><strong>%ld&nbsp;GB</strong></th>\\r
 <th style=\"text-align: right\"><strong>%Ld&nbsp;kb/s</strong></th>\\r
-<th style=\"text-align: right\"><strong>%Ld&nbsp;kb/s</strong></th></tr>\\r
-\n", total, line, (8*(total<<20))/max_logged_time/i);\r
+<th style=\"text-align: right\"><strong>-</strong></th></tr>\\r
+\n", total, line);\r
   fputs("</thead></table>\n", f);\r
 \r
   row_odd_even = 0;\r

diff --git a/prometheus.c b/prometheus.c
index f8ad197c86eba982fe83cef3a4b7f5ad428b80a8..993b185aeda82202bc4a85313c847e8c11a677dc 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,7 +7,7 @@
 /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */\r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
-/* Modified by: xChaos, 20151020\r
+/* Modified by: xChaos, 20160622\r
                  ludva, 20080415\r
  \r
    Prometheus QoS is free software; you can redistribute it and/or\r
@@ -29,7 +29,7 @@
 #include "cll1-0.6.2.h"\r
 #include "ipstruct.h"\r
 \r
-const char *version = "0.8.5-d";\r
+const char *version = "0.8.5-e";\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 /* Versions: 0.8.5 is development release, 0.8.6 will be "stable"  */\r
@@ -307,6 +307,7 @@ void get_config(char *config_filename)
   lloption("wan-download",line);\r
   lloption("wan-upload",up);\r
   ioption("hall-of-fame-enable",hall_of_fame);\r
+  ioption("digital-divide-weirdness-ratio",digital_divide);\r
   option("hall-of-fame-title",title);\r
   option("hall-of-fame-filename",html);\r
   option("json-filename",json_traffic);\r