X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=prometheus.c;h=0beef7a866ae1ee45fb786d270338ebdeafc7497;hb=e3e0ce38cc46910f8f20b48230c9e42c24524e94;hp=28d9894da561e8e115575bfd776de66902212fa5;hpb=70c65cfe58aa1ca614dc1acc7fa7eff03350e6c3;p=svn%2FPrometheus-QoS%2F.git

diff --git a/prometheus.c b/prometheus.c
index 28d9894..0beef7a 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -7,8 +7,8 @@
 /*  Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
 
-/* Modified: xChaos, 20080407
-             ludva, 20071227
+/* Modified: xChaos, 20080422
+             ludva, 20080415
 
    Prometheus QoS is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as 
@@ -33,9 +33,10 @@
 
 #include "cll1-0.6.h"
 
-const char *version="0.7.9.1"; /*0.7.9 will be last development, 0.8.0 first stable */
+const char *version="0.7.9.2"; /*0.7.9 will be last development, 0.8.0 first stable */
 
-/* ======= All path names are defined hear (for RPM patch) =======  */
+
+/* ======= All path names are defined here (for RPM patch) =======  */
 
 char *tc              = "/sbin/tc"; /* requires tc with HTB support */
 char *iptables        = "/sbin/iptables"; /* requires iptables utility */
@@ -755,7 +756,9 @@ program
  int parent=1;
  int just_flush=0;
  int nodelay=0;
- int just_preview=0;                   /* preview - generate just stats */
+ int just_preview=0;                /* preview - generate just stats */
+ int just_logs=0;                   /* just parse logs */
+ 
  char *chain_forward, *chain_postrouting;
  char *althosts=NULL;
   
@@ -776,9 +779,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   argument("-9") { just_flush=9; }
   argument("-p") { just_preview=1; }
   argument("-n") { nodelay=1; }
-  argument("-l") { just_preview=666; }
-  argument("-m") { just_preview=666; }
-  argument("-y") { just_preview=666; }
+  argument("-l") { just_logs=1; }
+  argument("-m") { just_logs=1; }
+  argument("-y") { just_logs=1; }
   argument("-?") { help(); exit(0); }
   argument("--help") { help(); exit(0); }
   argument("-v") { exit(0); } 
@@ -795,10 +798,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  /*-----------------------------------------------------------------*/
  get_config(config);
  
- if(just_preview == 666)
+ if(just_logs)
  {
-    parse_ip_log(argc,argv); 
-    exit(0); 
+    parse_ip_log(argc,argv);
+    exit(0);
  }
 
  if(althosts) hosts=althosts;
@@ -1373,8 +1376,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     iplog=fopen(str,"a");
     if(iplog)
     {
-     fprintf(iplog,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%s",
-                    time(NULL),ip->name,ip->traffic,ip->direct,ip->proxy,ip->upload,ip->min,ip->max,d); /* d = date*/
+     fprintf(iplog,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%s",
+                    time(NULL),ip->name,ip->traffic,ip->direct,ip->proxy,ip->upload,ip->min,ip->max,ip->desired,d); /* d = date*/
      fclose(iplog);
     }
    }