From d1dd0f041b98807ce8b6dfd5d46983427d3a7f16 Mon Sep 17 00:00:00 2001 From: xchaos Date: Wed, 22 Jun 2016 21:27:37 +0000 Subject: [PATCH] digital-divide, total avg.speed was nonsense git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@255 251d49ef-1d17-4917-a970-b30cf55b089b --- parselogs.c | 10 +++++----- prometheus.c | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) 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, "\n\ \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\n\ @@ -214,8 +214,8 @@ void parse_ip_log(int argc, char **argv) \ \ \ -\ -\n", total, line, (8*(total<<20))/max_logged_time/i); +\ +\n", total, line); fputs("
%s %s%dTotal:%ld GB%Ld kb/s%Ld kb/s
-
\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); -- 2.30.2