basic ipset support for qos-free-zone

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

diff --git a/parselogs.c b/parselogs.c
index ffd82a1e333e8d6bcf2bf46d061ae0fed9e3014d..53c0bd7da56d5e0bbffd9811fc38e7ad455a9b14 100644 (file)
--- a/parselogs.c
+++ b/parselogs.c
@@ -1,4 +1,6 @@
 #include "cll1-0.6.2.h"\r
+#include "cll1-0.6.2.h"\r
+\r
 #define STRLEN 512\r
 \r
 /* globals declared in prometheus.c */\r
@@ -10,7 +12,6 @@ extern char *html_log_dir;
 extern int row_odd_even;\r
 extern char *log_url;\r
 extern char *lms_url;\r
-extern long long int line;\r
 \r
 /* function implemented in prometheus.c */\r
 const char *tr_odd_even(void);\r
@@ -163,7 +164,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 +178,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
@@ -213,9 +214,9 @@ void parse_ip_log(int argc, char **argv)
   fprintf(f,"</tbody><thead><tr>\\r
 <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\"></th>\\r
+<th style=\"text-align: right\"></th></tr>\\r
+\n", total);\r
   fputs("</thead></table>\n", f);\r
 \r
   row_odd_even = 0;\r