X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=07980f637bfbd4a3762065dc7e3b812b974678f6;hp=b6eeb27beb663cf9a18eed5131cd5b72bd9d766b;hb=1c9cae56507516acf3eda8fcfe60a74bfe923ee4;hpb=6fb3c58ad91b3214a985824e1eb51ecaae442c60 diff --git a/prometheus.c b/prometheus.c index b6eeb27..07980f6 100644 --- a/prometheus.c +++ b/prometheus.c @@ -7,7 +7,7 @@ /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -/* Modified by: xChaos, 20120612 +/* Modified by: xChaos, 20121007 ludva, 20080415 Prometheus QoS is free software; you can redistribute it and/or @@ -26,14 +26,13 @@ GNU General Public License is located in file COPYING */ -#define STRLEN 256 -#define FIRSTGROUPID 1024 -#define FIRSTIPCLASS 2048 +#define STRLEN 512 #undef DEBUG #include "cll1-0.6.2.h" +#include "ipstruct.h" -const char *version = "0.8.3-f"; +const char *version = "0.8.3-g"; /* Version numbers: 0.8.3 is development releases ("beta"), 0.8.4 will be "stable" */ /* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */ @@ -71,6 +70,12 @@ int use_jquery_popups = 1; int row_odd_even = 0; /* */ +void parse_ip_log(int argc, char **argv); +/* implementid in parselog.c */ + +void parse_hosts(char *hosts); +/* implementid in parsehosts.c */ + const char *tr_odd_even(void) { row_odd_even = 1 - row_odd_even; @@ -143,6 +148,8 @@ int burst_main = 64; int burst_group = 32; int magic_treshold = 8; /* reduce ceil by X*magic_treshhold kbps (hard shaping) */ int keywordcount = 0; +int class_count = 0; +int ip_count = 0; /* not yet implemented: int fixed_packets = 0; maximum number of pps per IP address (not class!) int packet_limit = 5; maximum number of pps to htn CEIL, not rate !!! @@ -157,40 +164,11 @@ const int idxtable_treshold2 = 12; /* this is no longer configurable */ const int idxtable_bitmask1 = 3; /* this is no longer configurable */ const int idxtable_bitmask2 = 3; /* this is no longer configurable */ -/* ==== This is C<<1 stuff - learn C<<1 first! https://dev.arachne.cz/svn/cll1h ==== */ +struct IP *ips = NULL, *ip, *sharedip; +struct Group *groups = NULL, *group; +struct Keyword *keyword, *defaultkeyword=NULL, *keywords=NULL; -struct IP -{ - char *addr; - char *name; - char *sharing; - int min; - int desired; - int max; - int mark; - int prio; - int fixedprio; - int group; - int lmsid; - unsigned long long direct; - unsigned long long proxy; - unsigned long long upload; - unsigned long long traffic; - unsigned long long credit; - unsigned long pktsup; - unsigned long pktsdown; - struct Keyword *keyword; - list(IP); -} *ips=NULL, *ip, *sharedip; - -struct Group -{ - int min; - int count; - int desired; - int id; - list(Group); -} *groups=NULL, *group; +/* ==== This is C<<1 stuff - learn C<<1 first! https://dev.arachne.cz/svn/cll1h ==== */ struct Index { @@ -202,27 +180,6 @@ struct Index list(Index); } *idxs=NULL, *idx, *metaindex; -struct Keyword -{ - char *key; - - int asymetry_ratio; /* ratio for ADSL-like upload */ - int asymetry_fixed; /* fixed treshold for ADSL-like upload */ - int data_limit; /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */ - int data_prio; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */ - long fixed_limit; /* fixed data limit for setting lower HTB ceil */ - long fixed_prio; /* fixed data lmit for setting lower HTB prio */ - int reserve_min; /* bonus for nominal HTB rate bandwidth (in kbps) */ - int reserve_max; /* malus for nominal HTB ceil (in kbps) */ -// int divide_max; /* relative malus: new_ceil=rate+(old_ceil-rate)/divide_max */ -// int htb_ceil_bonus_divide; /* relative bonus: new_ceil=old_ceil+old_ceil/htb_ceil_bonus_divide */ - int default_prio; /* default HTB priority for this keyword */ - char *html_color; - int ip_count; - char *leaf_discipline; - - list(Keyword); -} *keyword,*defaultkeyword=NULL,*keywords=NULL; /* Damned, this must be object oriented! This looks almost like constructor ;-) */ @@ -709,57 +666,6 @@ void run_restore(void) free(restor); } -/* == This function strips extra characters after IP address and stores it = */ - -void parse_ip(char *str) -{ - char *ptr,*ipaddr=NULL,*ipname=NULL,*lmsid=NULL; - - ptr=strchr(str,'{'); - if(ptr) - { - lmsid=++ptr; - while(*ptr && *ptr!='}') - { - ptr++; - } - *ptr=0; - } - - ptr=str; - while(*ptr && *ptr!=' ' && *ptr!=9) - { - ptr++; - } - - *ptr=0; - ipaddr=str; - ptr++; - while(*ptr && (*ptr==' ' || *ptr==9)) - { - ptr++; - } - ipname=ptr; - while(*ptr && *ptr!=' ' && *ptr!=9) - { - ptr++; - } - *ptr=0; - - if_exists(ip,ips,eq(ip->addr,ipaddr)); - else - { - TheIP(); - } - ip->addr=ipaddr; - ip->name=ipname; - if(lmsid) - { - ip->lmsid=atoi(lmsid); - found_lmsid=1; - } -} - char *parse_datafile_line(char *str) { char *ptr=strchr(str,' '); @@ -776,284 +682,6 @@ char *parse_datafile_line(char *str) } } -struct IpLog -{ - char *name; - long traffic; - long guaranted; - int i; - int lmsid; - long l; - list(IpLog); -} *iplog,*iplogs; - -void parse_ip_log(int argc, char **argv) -{ - char *month, *year, *str, *name="(undefined)", *ptr, *ptr2, *filename; - long traffic=0l, traffic_month, total=0, guaranted; - int col, col2, y_ok, m_ok, accept_month, i=1, any_month=0, lmsid; - char mstr[4], ystr[5]; - FILE *f; - string(str,STRLEN); - string(filename,STRLEN); - - if(argv[1][1]=='l') /* -l */ - { - if(argc<4) - { - puts("Missing parameter(s)!\nUsage: prometheus -l Mmm YYYY (Mmm=Jan-Dec or Year, YYYY=year)"); - exit(-1); - } - else - { - month=argv[2]; - if(eq(month,"Year")) any_month=1; - year=argv[3]; - } - } - else - { - time_t t = time(NULL) - 3600*24 ; /* yesterday's timestamp*/ - struct tm *timep = localtime(&t); - - if(argv[1][1]=='m') /* -m yestarday - month */ - { - strftime(mstr, 4, "%b", timep); - month=mstr; - strftime(ystr, 5, "%Y", timep); - year=ystr; - } - else /* -y yesterday - year */ - { - month="Year"; - any_month=1; - strftime(ystr, 5, "%Y", timep); - year=ystr; - } - } - printf("Analysing traffic for %s %s ...\n",month,year); - - /* sorry... next release of C<<1 header file will include for_path_files(name,path) { } macro */ - sprintf(str,"%s %s/",ls,log_dir); - shell(str); - input(str,STRLEN) - { - if(strstr(str,".log")) - { - ptr=strrchr(str,'\n'); - if(ptr) *ptr='\0'; - sprintf(filename,"%s/%s",log_dir,str); - printf("Parsing %s ...",filename); - accept_month=0; - traffic_month=0; - guaranted=0; - lmsid=-1; - parse(filename) - { - y_ok=m_ok=0; - valid_columns(ptr,_,'\t',col) switch(col) - { - case 2: name = ptr;break; - case 3: traffic = atol(ptr);break; - /* column number - was 7, now 11...*/ - case 7: - case 8: - case 9: - case 10: - case 11: if(isalpha(*ptr)) /* character, not numeric 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(col == 10) lmsid = atoi(ptr); - } - } - - if(y_ok && m_ok) - { - traffic_month += traffic; - accept_month = 1; - } - } - done; /* ugly macro end */ - - if(accept_month) - { - create(iplog,IpLog); - iplog->name = name; - iplog->guaranted = guaranted; - iplog->traffic = traffic_month; - iplog->lmsid = lmsid; - insert(iplog,iplogs,desc_order_by,traffic); - printf(" %ld MB\n",iplog->traffic); - } - else - { - puts(" no records."); - } - } - } - sprintf(str,"%s/%s-%s.html",html_log_dir,year,month); - printf("Writing %s ... ",str); - f=fopen(str,"w"); - if(f > 0) - { - fprintf(f, "\n\ -\n\ -\n\ -\n\ -\n\ -\n ", - month, year); - - row_odd_even = 0; - for_each(iplog, iplogs) - { - if(iplog->traffic) - { - fprintf(f, "%s\n\ -\n\ -\n\ - \n\ - \n", - iplog->traffic, iplog->traffic>>10, iplog->guaranted); - total+=iplog->traffic>>10; - iplog->i=i; - iplog->l=total; - } - } - fprintf(f,"\ - \ - \ - \n", total, line); - fputs("
%s %slmsData transfersMin.speed
%d%s", - tr_odd_even(), i++, log_url, iplog->name, iplog->name); - if(iplog->lmsid > 0) - { - /*base URL will be configurable soon ... */ - fprintf(f, "%04d\n", lms_url, iplog->lmsid, iplog->lmsid); - } - else if(iplog->lmsid == 0) - { - fputs("-------",f); - } - fprintf(f, "%ld MB%ld GB%ld kb/s
Total:%ld GB%Ld kb/s
\n", f); - - row_odd_even = 0; - if(i>10) - { - fputs("

\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n",f); - - if_exists(iplog,iplogs,iplog->l>=total/4) - { - fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); - } - - if_exists(iplog,iplogs,iplog->i==10) - { - fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); - } - - if_exists(iplog,iplogs,iplog->l>=total/2) - { - fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total)); - } - - if_exists(iplog,iplogs,iplog->l>=4*total/5) - { - fprintf(f,"%s\n",tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); - } - - if_exists (iplog,iplogs,iplog->i>=i/5) - { - fprintf(f,"%s\n",tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); - } - - if_exists(iplog,iplogs,iplog->i>=i/4) - { - fprintf(f,"%s\n", tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); - } - - if_exists(iplog,iplogs,iplog->i>=i/2) - { - fprintf(f,"%s\n",tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); - } - - if_exists(iplog,iplogs,iplog->i>=4*i/5) - { - fprintf(f,"%s\n",tr_odd_even()); - fprintf(f,"\n\ -\n\ -\n\ -\n", - iplog->i, (100*iplog->i+50)/i, iplog->l, (int)((100*iplog->l+50)/total)); - } - - fprintf(f,"\n", log_url); - fprintf(f,"\n\ -\n\ -\n\ -\n",i-1,total); - fputs("
Enterprise Resource Planning (ERP)
Analytic categoryActive ClassesData transfers
Top 25%% of traffic%d%d %%%ld GB%d %%
Top 10 downloaders10%d %%%ld GB%d %%
Top 50%% of traffic%d%d %%%ld GB%d %%
Top 80%% of traffic%d%d %%%ld GB%d %%
Top 20%% downloaders%d%d %%%ld GB%d %%
Top 25%% downloaders%d%d %%%ld GB%d %%
Top 50%% downloaders%d%d %%%ld GB%d %%
Top 80%% downloaders%d%d %%%ld GB%d %%
All users, all traffic%d100 %%%ld GB100 %%
\n", f); - } - - fprintf(f, stats_html_signature, version); - fclose(f); - puts("done."); - } - else - { - perror(str); - } -} - void append_log(struct IP *self) /*using global variables*/ { char *d, *str; @@ -1076,7 +704,6 @@ void append_log(struct IP *self) /*using global variables*/ } } - /*-----------------------------------------------------------------*/ /* Are you looking for int main(int argc, char **argv) ? :-)) */ /*-----------------------------------------------------------------*/ @@ -1087,7 +714,7 @@ program FILE *f=NULL; /* everything is just stream of bytes... */ char *str, *ptr, *d; /* LET A$=B$ :-) */ char *substring; - int class_count=0,ip_count=0; + int parent=1; int just_flush=FALSE; /* deactivates all previous actions */ int nodelay=FALSE; @@ -1166,107 +793,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /*-----------------------------------------------------------------*/ printf("Parsing class defintion file %s ...\n", hosts); /*-----------------------------------------------------------------*/ - int groupidx = FIRSTGROUPID; - parse(hosts) - { - str=_; - - if(*str<'0' || *str>'9') - { - /* any line starting with non-number is comment ...*/ - continue; - } - - //Does this IP share QoS class with some other ? - substring=strstr(str,"sharing-"); - if(substring) - { - substring+=8; //"sharing-" - parse_ip(str); - ip_count++; - ip->sharing=substring; - ip->keyword=defaultkeyword; /* settings for default keyword */ - while(*substring && *substring!='\n') - { - substring++; - } - *substring=0; - } - else - { - //Do we have to create new QoS class for this IP ? - - if_exists(keyword,keywords,(substring=strstr(str,keyword->key))) - { - parse_ip(str); - ip_count++; - ip->keyword=keyword; - keyword->ip_count++; - ip->prio=keyword->default_prio; - substring+=strlen(keyword->key)+1; - ptr=substring; - while(*ptr && *ptr!='-') - { - ptr++; - } - if(*ptr=='-') - { - *ptr=0; - ip->max = ip->desired=atoi(ptr+1); - } - ip->min = atoi(substring); - if(ip->min <= 0) - { - printf(" %s: Illegal value of minimum bandwidth 0 kbps, using %d kb/s\n", - str, free_min); - ip->min = free_min; - } - if(ip->max <= ip->min) - { - ip->fixedprio = 1; - ip->max = ip->min+ip->keyword->reserve_min; - } - else - { - ip->max -= ip->keyword->reserve_max; - if(ip->maxmin) - { - ip->max=ip->min; - } - } - ip->mark=FIRSTIPCLASS+1+class_count++; - - if_exists(group,groups,group->min==ip->min) - { - group->count++; - group->desired += ip->min; - ip->group = group->id; - } - else - { - create(group,Group); - group->min = ip->min; - group->id = groupidx++; - ip->group = group->id; - - if(group->min<8) group->min=8; - /* Warning - this is maybe because of primitive tc namespace, can be fixed */ - /* it is because class IDs are derived from min. bandwidth. - xCh */ - //if(group->min>MAX_GUARANTED_KBPS) group->min=MAX_GUARANTED_KBPS; - - group->count=1; - group->desired=ip->min; - insert(group,groups,desc_order_by,min); - } - }//endif keyword- - }//endif sharing- - } - fail - { - perror(hosts); - exit(-1); - } - done; /* ugly macro end */ + parse_hosts(hosts); /*-----------------------------------------------------------------*/ /* cll1.h - let's allocate brand new character buffer... */ @@ -1286,7 +813,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); ip->lmsid=sharedip->lmsid; break; } - if(!sharedip) + if(not sharedip) { printf("Unresolved shared connection: %s %s sharing-%s\n", ip->addr, ip->name, ip->sharing);