X-Git-Url: https://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=8a567a173671e6be1758b5f88d11a43facf48b52;hp=28d9894da561e8e115575bfd776de66902212fa5;hb=5a8f2e77c57c7c7f2fcf1ef5933a0a771dd57777;hpb=70c65cfe58aa1ca614dc1acc7fa7eff03350e6c3 diff --git a/prometheus.c b/prometheus.c index 28d9894..8a567a1 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,14 @@ #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-c"; -/* ======= All path names are defined hear (for RPM patch) ======= */ +/* 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) ======= */ char *tc = "/sbin/tc"; /* requires tc with HTB support */ char *iptables = "/sbin/iptables"; /* requires iptables utility */ @@ -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,"\n ",month,year); + fprintf(f,"
Data transfers - %s %s
\n ",month,year); every(iplog,iplogs) if(iplog->traffic) { - fprintf(f,"\n",i++,iplog->name,iplog->traffic,iplog->traffic>>10); + fprintf(f,"\n", + i++, iplog->name, iplog->traffic, iplog->traffic>>10, iplog->guaranted); total+=iplog->traffic>>10; } - fprintf(f,"\n",total); + fprintf(f,"\n", total, line); fputs("
Data transfers - %s %sMin.speed
%d%s%ld MB%ld GB
%d%s%ld MB%ld GB%ld kbps
Total:%ld GB
Total:%ld GB%Ld kbps
\n",f); fclose(f); puts(" done."); @@ -755,7 +776,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 +799,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 +818,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 +1396,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); } }