X-Git-Url: https://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=8a567a173671e6be1758b5f88d11a43facf48b52;hp=0f0cf00170a6773c28a817b2ebf65b7f1ac26f01;hb=5a8f2e77c57c7c7f2fcf1ef5933a0a771dd57777;hpb=82c702a19c700ceee3ac1cae841f30a516467ec9

diff --git a/prometheus.c b/prometheus.c
index 0f0cf00..8a567a1 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -33,7 +33,12 @@
 
 #include "cll1-0.6.h"
 
-const char *version="0.7.9.2"; /*0.7.9 will be last development, 0.8.0 first stable */
+const char *version="0.7.9-c"; 
+
+/* Version numbers: 0.7.9 will be last development ("beta"), 0.8.0 first stable */
+/* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */
+/* C source code development versions ("beta"): 0.7.9-a, 0.8.1-b, etc. */
+/* C source code release versions: 0.8.0, 0.8.2, 0.8.4, etc. */
 
 /* ======= All path names are defined here (for RPM patch) =======  */
 
@@ -435,7 +440,7 @@ void get_config(char *config_filename)
  /* are supplied values meaningful ?*/
  if(line<=0 || up<=0)
  {
-  puts("Illegal value of wan bandwidth: 0 kbps.");
+  puts("Illegal value of LAN or WAN bandwidth: 0 kbps.");
   reject_config_and_exit(config_filename);
  }
 }
@@ -547,7 +552,6 @@ void get_traffic_statistics(void)
     }  
   }
 
-
  free(cmd);
 }
  
@@ -632,17 +636,17 @@ struct IpLog
 {
  char *name;
  long traffic;
+ long guaranted;
  list(IpLog);
 } *iplog,*iplogs;
 
 void parse_ip_log(int argc, char **argv) 
 {
- char *month,*year,*str,*name,*ptr,*ptr2;
- long traffic,traffic_month,total=0;
- int col,col2,y_ok,m_ok,accept_month,i=1,any_month=0;
- char mstr[4],ystr[5];
- FILE *f;
- 
+ char *month, *year, *str, *name, *ptr, *ptr2;
+ long traffic, traffic_month, total=0, guaranted;
+ int col, col2, y_ok, m_ok, accept_month, i=1, any_month=0;
+ char mstr[4], ystr[5];
+ FILE *f; 
  string(str,STRLEN);
 
  if(argv[1][1]=='l') /* -l */
@@ -683,6 +687,7 @@ void parse_ip_log(int argc, char **argv)
 
  sprintf(str,"%s %s/*.log",ls,log_dir);
  shell(str);
+
  input(str,STRLEN)
  {
   ptr=strrchr(str,'\n');
@@ -690,31 +695,46 @@ void parse_ip_log(int argc, char **argv)
   printf("Parsing %s ...",str);
   accept_month=0;
   traffic_month=0;
+  guaranted = 0;
   parse(str)
   {
    y_ok=m_ok=0;  
    valid_columns(ptr,_,'\t',col) switch(col)
    {
-    case 2: name=ptr;break;
-    case 3: traffic=atol(ptr);break;
-    case 7: valid_columns(ptr2,ptr,' ',col2) switch(col2)
-            {
-             case 2: if(any_month || eq(ptr2,month)) m_ok=1; break;
-             case 5: if(eq(ptr2,year)) y_ok=1; break;
-            }
+    case 2: name = ptr;break;
+    case 3: traffic = atol(ptr);break;
+    /* column number   - was 7, now 10...*/
+    case 7:
+    case 8:
+    case 9:
+    case 10: if (isalnum(*ptr)) /* alphanumeric string = date, just one*/
+             {
+               valid_columns(ptr2,ptr,' ',col2) switch(col2)
+               {
+                case 2: if(any_month || eq(ptr2,month)) m_ok = 1; break;
+                case 5: if(eq(ptr2,year)) y_ok = 1; break;
+               }
+             }
+             else
+             {
+               if(col == 7) guaranted = atol(ptr);
+             }
    }
+   
    if(y_ok && m_ok) 
    {
-    traffic_month+=traffic;
-    accept_month=1;
+    traffic_month += traffic;
+    accept_month = 1;
    }
   }
   done;
+
   if(accept_month)
   {
    create(iplog,IpLog);
-   iplog->name=name;
-   iplog->traffic=traffic_month;
+   iplog->name = name;
+   iplog->guaranted = guaranted;
+   iplog->traffic = traffic_month;
    insert(iplog,iplogs,desc_order_by,traffic);
    printf(" %ld MB\n",iplog->traffic);
   }
@@ -726,14 +746,15 @@ void parse_ip_log(int argc, char **argv)
  f=fopen(str,"w");
  if(f)
  {
-  fprintf(f,"<table border><tr><th colspan=\"4\">Data transfers - %s %s</th></tr>\n ",month,year);
+  fprintf(f,"<table border><tr><th colspan=\"4\">Data transfers - %s %s</th><th align=\"right\">Min.speed</th></tr>\n ",month,year);
   every(iplog,iplogs)
    if(iplog->traffic)
    {
-    fprintf(f,"<tr><td align=\"right\">%d</td><th>%s</td><td align=\"right\">%ld MB</td><th align=\"right\">%ld GB</th></tr>\n",i++,iplog->name,iplog->traffic,iplog->traffic>>10);
+    fprintf(f,"<tr><td align=\"right\">%d</td><th>%s</td><td align=\"right\">%ld MB</td><th align=\"right\">%ld GB</th><th align=\"right\">%ld kbps</th></tr>\n",
+              i++, iplog->name, iplog->traffic, iplog->traffic>>10, iplog->guaranted);
     total+=iplog->traffic>>10;
    }
-  fprintf(f,"<tr><th colspan=\"3\" align=\"left\">Total:</th><th align=\"right\">%ld GB</th></tr>\n",total);
+  fprintf(f,"<tr><th colspan=\"3\" align=\"left\">Total:</th><th align=\"right\">%ld GB</th><th align=\"right\">%Ld kbps</th></tr>\n", total, line);
   fputs("</table>\n",f);
   fclose(f);
   puts(" done.");