improved log parsing

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

diff --git a/prometheus.c b/prometheus.c
index 984778758a1c951010b26c976f64f74c7cf3756f..d8eaef2d44f4dee405ef9d603ce9b082cffdca43 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,8 +7,8 @@
 /*  Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */\r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */\r
 \r
-/* Modified: xChaos, 20080407\r
-             ludva, 20071227\r
+/* Modified: xChaos, 20080422\r
+             ludva, 20080415\r
 \r
    Prometheus QoS is free software; you can redistribute it and/or\r
    modify it under the terms of the GNU General Public License as \r
@@ -33,9 +33,14 @@
 \r
 #include "cll1-0.6.h"\r
 \r
-const char *version="0.7.9.1"; /*0.7.9 will be last development, 0.8.0 first stable */\r
+const char *version="0.7.9-c"; \r
 \r
-/* ======= All path names are defined hear (for RPM patch) =======  */\r
+/* Version numbers: 0.7.9 will be last development ("beta"), 0.8.0 first stable */\r
+/* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */\r
+/* C source code development versions ("beta"): 0.7.9-a, 0.8.1-b, etc. */\r
+/* C source code release versions: 0.8.0, 0.8.2, 0.8.4, etc. */\r
+\r
+/* ======= All path names are defined here (for RPM patch) =======  */\r
 \r
 char *tc              = "/sbin/tc"; /* requires tc with HTB support */\r
 char *iptables        = "/sbin/iptables"; /* requires iptables utility */\r
@@ -435,7 +440,7 @@ void get_config(char *config_filename)
  /* are supplied values meaningful ?*/\r
  if(line<=0 || up<=0)\r
  {\r
-  puts("Illegal value of wan bandwidth: 0 kbps.");\r
+  puts("Illegal value of LAN or WAN bandwidth: 0 kbps.");\r
   reject_config_and_exit(config_filename);\r
  }\r
 }\r
@@ -683,6 +688,7 @@ void parse_ip_log(int argc, char **argv)
 \r
  sprintf(str,"%s %s/*.log",ls,log_dir);\r
  shell(str);\r
+\r
  input(str,STRLEN)\r
  {\r
   ptr=strrchr(str,'\n');\r
@@ -697,12 +703,19 @@ void parse_ip_log(int argc, char **argv)
    {\r
     case 2: name=ptr;break;\r
     case 3: traffic=atol(ptr);break;\r
-    case 7: valid_columns(ptr2,ptr,' ',col2) switch(col2)\r
+    /* column number   - was 7, now 9...*/\r
+    case 7:\r
+    case 8:\r
+    case 9: if (isalnum(*ptr)) /* alphanumeric string = date, just one*/\r
             {\r
-             case 2: if(any_month || eq(ptr2,month)) m_ok=1; break;\r
-             case 5: if(eq(ptr2,year)) y_ok=1; break;\r
+              valid_columns(ptr2,ptr,' ',col2) switch(col2)\r
+              {\r
+               case 2: if(any_month || eq(ptr2,month)) m_ok=1; break;\r
+               case 5: if(eq(ptr2,year)) y_ok=1; break;\r
+              }\r
             }\r
    }\r
+   \r
    if(y_ok && m_ok) \r
    {\r
     traffic_month+=traffic;\r
@@ -710,6 +723,7 @@ void parse_ip_log(int argc, char **argv)
    }\r
   }\r
   done;\r
+\r
   if(accept_month)\r
   {\r
    create(iplog,IpLog);\r
@@ -755,7 +769,9 @@ program
  int parent=1;\r
  int just_flush=0;\r
  int nodelay=0;\r
- int just_preview=0;                   /* preview - generate just stats */\r
+ int just_preview=0;                /* preview - generate just stats */\r
+ int just_logs=0;                   /* just parse logs */\r
+ \r
  char *chain_forward, *chain_postrouting;\r
  char *althosts=NULL;\r
   \r
@@ -776,9 +792,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   argument("-9") { just_flush=9; }\r
   argument("-p") { just_preview=1; }\r
   argument("-n") { nodelay=1; }\r
-  argument("-l") { just_preview=666; }\r
-  argument("-m") { just_preview=666; }\r
-  argument("-y") { just_preview=666; }\r
+  argument("-l") { just_logs=1; }\r
+  argument("-m") { just_logs=1; }\r
+  argument("-y") { just_logs=1; }\r
   argument("-?") { help(); exit(0); }\r
   argument("--help") { help(); exit(0); }\r
   argument("-v") { exit(0); } \r
@@ -795,10 +811,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  /*-----------------------------------------------------------------*/\r
  get_config(config);\r
  \r
- if(just_preview == 666)\r
+ if(just_logs)\r
  {\r
-    parse_ip_log(argc,argv); \r
-    exit(0); \r
+    parse_ip_log(argc,argv);\r
+    exit(0);\r
  }\r
 \r
  if(althosts) hosts=althosts;\r