- /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
- /* Prometheus QoS - you can "steal fire" from your ISP */\r
-/* "fair-per-IP" quality of service (QoS) utility */\r
-/* requires Linux 2.4.x or 2.6.x with HTB support */\r
-/* Copyright(C) 2005-2008 Michael Polak (xChaos) */\r
-/* iptables-restore support Copyright(C) 2007-2008 ludva */\r
-/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */\r
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-\r
-/* Modified by: xChaos, 20110428\r
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
+/* Prometheus QoS - you can "steal fire" from your ISP */\r
+/* "fair-per-IP" quality of service (QoS) utility */\r
+/* requires Linux 2.4.x or 2.6.x with HTB support */\r
+/* Copyright(C) 2005-2013 Michael Polak, Arachne Aerospace */\r
+/* iptables-restore support Copyright(C) 2007-2008 ludva */\r
+/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */\r
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
+\r
+/* Modified by: xChaos, 20130114\r
ludva, 20080415\r
\r
Prometheus QoS is free software; you can redistribute it and/or\r
\r
GNU General Public License is located in file COPYING */\r
\r
-#define STRLEN 256\r
-#define FIRSTGROUPID 1024\r
-#define FIRSTIPCLASS 2048\r
-#undef DEBUG\r
-\r
#include "cll1-0.6.2.h"\r
+#include "ipstruct.h"\r
\r
-const char *version = "0.8.3"; \r
+const char *version = "0.8.3-g";\r
\r
-/* Version numbers: 0.8.3 is development releases ("beta"), 0.8.4 will be "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
+/* Versions: 0.8.3 is development release, 0.8.4 will be "stable" */\r
+/* Official Trac URL: https://dev.arachne.cz/svn/prometheus */\r
+/* Official SVN URL: https://dev.arachne.cz/repos/prometheus */\r
+/* BTC donations account: 19rriLx8vR19wGefPaMhakqnCYNYwjLvxq */\r
+/* CZK donations account: 2900242944/2010 (transparent account) */\r
+/* Warning: unofficial Github mirror is not supported by author! */\r
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
\r
-const char *stats_html_signature = "<small>Statistics generated by Prometheus QoS version %s<br>GPL+Copyright(C)2005-2011 Michael Polak, <a href=\"http://www.arachne.cz/\">Arachne Labs</a></small>\n";\r
+const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2013 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";\r
+\r
+#define STRLEN 512\r
+#undef DEBUG\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
-char *iptablessave = "/sbin/iptables-save"; /* not yet required */\r
-char *iptablesrestore = "/sbin/iptables-restore"; /* requires iptables-restore */\r
-const char *ls = "/bin/ls"; /* this is not user configurable :-) */\r
+const char *tc = "/sbin/tc"; /* requires tc with HTB support */\r
+const char *iptables = "/sbin/iptables"; /* requires iptables utility */\r
+const char *ip6tables = "/sbin/ip6tables"; /* requires iptables utility */\r
+const char *iptablessave = "/sbin/iptables-save"; /* not yet required */\r
+const char *iptablesrestore = "/sbin/iptables-restore"; /* requires iptables-restore */\r
+const char *ip6tablessave = "/sbin/ip6tables-save"; /* not yet required */\r
+const char *ip6tablesrestore = "/sbin/ip6tables-restore"; /* requires iptables-restore */\r
+const char *ls = "/bin/ls"; /* this is not user configurable :-) */\r
\r
char *config = "/etc/prometheus/prometheus.conf"; /* main configuration file */\r
char *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition file */\r
-\r
char *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/\r
char *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */\r
-char *html = "/var/www/traffic.html"; /* hall of fame filename */\r
-char *preview = "/var/www/preview.html"; /* hall of fame preview */\r
+char *classmap = "/var/lib/misc/prometheus.classes"; /* credit log file */\r
+char *html = "/var/www/traffic.html"; /* hall of fame - html version */\r
+char *preview = "/var/www/preview.html"; /* hall of fame preview - html version */\r
+char *json_traffic = "/var/www/logs/traffic.json"; /* hall of fame - json version */\r
+char *json_preview = "/var/www/logs/preview.json"; /* hall of fame preview - json version */\r
char *cmdlog = "/var/log/prometheuslog"; /* command log filename */\r
char *log_dir = "/var/www/logs/"; /* log directory pathname, ended with slash */\r
-char *log_url = "logs/"; /* log directory relative URI prefix (partial URL) */\r
+char *log_url = "/logs/"; /* log directory relative URI prefix (partial URL) */\r
char *html_log_dir = "/var/www/logs/html/";\r
\r
-/* ======= Help screen is hopefuly self-documenting part of code :-) ======= */\r
-\r
-void help(void)\r
-{\r
- puts("Command line switches:\n\\r
-\n\\r
--?, --help this help screen\n\\r
--v, --version show Version number of this utility and exit\n\\r
--c filename force alternative /etc/prometheus.Conf filename\n\\r
--h filename force alternative /etc/Hosts filename (overrides hosts keyword)\n\\r
--f just Flush iptables and tc classes and exit (stop shaping)\n\\r
--9 emergency iptables flush (do not read data transfer statistics)\n\\r
--p just generate Preview of data transfer statistics and exit\n\\r
--d Dry run (preview tc and iptables commands on stdout)\n\\r
--r Run (reset all statistics and start shaping)\n\\r
--n run Now (start shaping without delay - overrides qos-free-delay keyword)\n\\r
--l Mmm YYYY generate HTML summary of traffic Logs (Mmm=Jan-Dec or Year, YYYY=year)\n\\r
--m generate HTML summary of traffic logs for yesterday's Month\n\\r
--y generate HTML summary of traffic logs for yesterday's Year\n");\r
-/* not yet implemented:\r
--s start shaping! (keep data transfer statistics - but apply shaping)\n\\r
-*/\r
-}\r
-\r
+char *jquery_url = "http://code.jquery.com/jquery-latest.js";\r
+char *lms_url = "/lms/?m=customerinfo&id=";\r
+int use_jquery_popups = TRUE;\r
+int row_odd_even = 0; /*<tr class="odd/even"> */\r
+ \r
/* === Configuraration file values defaults - stored in global variables ==== */\r
\r
int filter_type = 1; /*1 mark, 2 classify*/\r
char *mark = "MARK";\r
char *mark_iptables = "MARK --set-mark ";\r
-int dry_run = 0; /* preview - use puts() instead of system() */\r
+int dry_run = FALSE; /* preview - use puts() instead of system() */\r
char *iptablespreamble = "*mangle\n:PREROUTING ACCEPT [0:0]\n:POSTROUTING ACCEPT [0:0]\n:INPUT ACCEPT [0:0]\n:OUTPUT ACCEPT [0:0]\n:FORWARD ACCEPT [0:0]";\r
FILE *iptables_file = NULL;\r
-int enable_credit = 1; /* enable credit file */\r
-int use_credit = 0; /* use credit file (if enabled)*/\r
+int enable_credit = TRUE; /* enable credit file */\r
+int use_credit = FALSE; /* use credit file (if enabled)*/\r
char *title = "Hall of Fame - Greatest Suckers"; /* hall of fame title */\r
-int hall_of_fame = 1; /* enable hall of fame */\r
+int hall_of_fame = TRUE; /* enable hall of fame */\r
char *lan = "eth0"; /* LAN interface */\r
char *lan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */\r
char *wan = "eth1"; /* WAN/ISP interface */\r
char *wan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */\r
char *qos_leaf = "sfq perturb 5"; /* leaf discipline */\r
char *qos_free_zone = NULL; /* QoS free zone */\r
-int qos_proxy = 1; /* include proxy port to QoS */\r
-int found_lmsid = 0; /* show links to users in LMS information system */\r
-int include_upload = 1; /* upload+download=total traffic */\r
+int qos_proxy = TRUE; /* include proxy port to QoS */\r
+int found_lmsid = FALSE; /* show links to users in LMS information system */\r
+int include_upload = TRUE; /* upload+download=total traffic */\r
char *proxy_ip = "192.168.1.1/32"; /* our IP with proxy port */\r
int proxy_port = 3128; /* proxy port number */\r
long long int line = 1024; /* WAN/ISP download in kbps */\r
int burst_group = 32;\r
int magic_treshold = 8; /* reduce ceil by X*magic_treshhold kbps (hard shaping) */\r
int keywordcount = 0;\r
+int class_count = 0;\r
+int ip_count = 0;\r
/* not yet implemented:\r
int fixed_packets = 0; maximum number of pps per IP address (not class!) \r
int packet_limit = 5; maximum number of pps to htn CEIL, not rate !!! \r
const int idxtable_bitmask1 = 3; /* this is no longer configurable */\r
const int idxtable_bitmask2 = 3; /* this is no longer configurable */\r
\r
-/* ==== This is C<<1 stuff - learn C<<1 first! https://dev.arachne.cz/svn/cll1h ==== */\r
+struct IP *ips = NULL, *ip, *sharedip;\r
+struct Group *groups = NULL, *group;\r
+struct Keyword *keyword, *defaultkeyword=NULL, *keywords=NULL;\r
\r
-struct IP\r
-{\r
- char *addr;\r
- char *name;\r
- char *sharing;\r
- int min;\r
- int desired;\r
- int max;\r
- int mark;\r
- int prio;\r
- int fixedprio;\r
- int group;\r
- int lmsid;\r
- unsigned long long direct;\r
- unsigned long long proxy;\r
- unsigned long long upload;\r
- unsigned long long traffic;\r
- unsigned long long credit;\r
- unsigned long pktsup;\r
- unsigned long pktsdown;\r
- struct Keyword *keyword;\r
- list(IP);\r
-} *ips=NULL, *ip, *sharedip;\r
-\r
-struct Group\r
+void help(void);\r
+/* implemented in help.c */
+\r
+void get_traffic_statistics(const char *whichiptables);\r
+/* implemented in parseiptables.c */\r
+\r
+void parse_ip_log(int argc, char **argv);\r
+/* implemented in parselog.c */\r
+\r
+void parse_hosts(char *hosts);\r
+/* implemented in parsehosts.c */\r
+\r
+void write_json_traffic(char *json);\r
+/* implemented in json.c */\r
+\r
+void write_htmlandlogs(char *html, char *d, int total, int just_preview);\r
+/* implemented in htmlandlogs.c */\r
+\r
+const char *tr_odd_even(void)\r
{\r
- int min;\r
- int count;\r
- int desired;\r
- int id;\r
- list(Group);\r
-} *groups=NULL, *group;\r
+ row_odd_even = 1 - row_odd_even;\r
+ if(row_odd_even)\r
+ {\r
+ return "<tr class=\"even\">\n";\r
+ }\r
+ else\r
+ {\r
+ return "<tr class=\"odd\">\n";\r
+ }\r
+}\r
+\r
+/* ==== This is C<<1 stuff - learn C<<1 first! https://dev.arachne.cz/svn/cll1h ==== */\r
+/* (except that this code uses obsolete, archaic version of this header file...) */\r
\r
struct Index\r
{\r
list(Index);\r
} *idxs=NULL, *idx, *metaindex;\r
\r
-struct Keyword\r
-{\r
- char *key;\r
- \r
- int asymetry_ratio; /* ratio for ADSL-like upload */\r
- int asymetry_fixed; /* fixed treshold for ADSL-like upload */\r
- int data_limit; /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */\r
- int data_prio; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */\r
- long fixed_limit; /* fixed data limit for setting lower HTB ceil */\r
- long fixed_prio; /* fixed data lmit for setting lower HTB prio */\r
- int reserve_min; /* bonus for nominal HTB rate bandwidth (in kbps) */\r
- int reserve_max; /* malus for nominal HTB ceil (in kbps) */\r
-// int divide_max; /* relative malus: new_ceil=rate+(old_ceil-rate)/divide_max */\r
-// int htb_ceil_bonus_divide; /* relative bonus: new_ceil=old_ceil+old_ceil/htb_ceil_bonus_divide */\r
- int default_prio; /* default HTB priority for this keyword */\r
- char *html_color;\r
- int ip_count;\r
- char *leaf_discipline;\r
- \r
- list(Keyword);\r
-} *keyword,*defaultkeyword=NULL,*keywords=NULL;\r
-\r
-/* Damned, this must be object oriented! This looks almost like constructor ;-) */\r
-\r
-void TheIP(void)\r
-{\r
- create(ip,IP);\r
- ip->name = "";\r
- ip->addr = "";\r
- ip->sharing = NULL;\r
- ip->prio = highest_priority+1;\r
- ip->lmsid = -1;\r
- ip->fixedprio = \\r
- ip->mark = \\r
- ip->min = \\r
- ip->max = \\r
- ip->desired = \\r
- ip->credit = \\r
- ip->upload = \\r
- ip->proxy = \\r
- ip->direct = \\r
- ip->traffic = \\r
- ip->pktsup = \\r
- ip->pktsdown = 0;\r
- ip->keyword = keywords;\r
- push(ip,ips);\r
-}\r
\r
/* ====== iptables indexes are used to reduce complexity to log8(N) ===== */\r
\r
-char *very_ugly_ipv4_code(char *inip,int bitmask,int format_as_chainname)\r
-{\r
- /* warning: this function was debugged only for bitmask values 20,24,28 !!!*/\r
- int dot=0,n;\r
- char *ip,*outip,*outptr,*fmt;\r
-\r
- duplicate(inip,ip);\r
- /* debug printf("(%s,%d) -> ",ip,bitmask); */\r
-\r
- if(ip && *ip && bitmask>=0 && bitmask<=32)\r
- {\r
- string(outip,strlen(ip)+10); /*fuck unicode? assertion: 10>strlen("_%d_%d") */\r
- }\r
- else \r
- {\r
- /* should never exit here */\r
- return "undefined";\r
- }\r
- outptr=outip;\r
- while(ip && *ip)\r
- {\r
- if(*ip=='.')\r
- {\r
- if(dot<(bitmask/8-1)) \r
- {\r
- if(format_as_chainname)\r
- {\r
- *outptr='_';\r
- }\r
- else\r
- {\r
- *outptr='.';\r
- }\r
- outptr++;\r
- dot++;\r
- }\r
- else\r
- {\r
- char *cutdot=strchr(ip+1,'.'); /*for bitmask<24*/\r
- if(cutdot)*cutdot='\0';\r
- if(format_as_chainname)\r
- fmt="_%d_%d";\r
- else\r
- fmt=".%d";\r
- if(bitmask%8)\r
- n=atoi(ip+1)-atoi(ip+1)%(1<<(8-bitmask%8));\r
- else\r
- n=0;\r
-\r
- /*debug printf("%d/%d => [_%d_%d]\n",atoi(ip+1),bitmask,n,bitmask); */\r
- sprintf(outptr,fmt,n,bitmask);\r
- if(!format_as_chainname) while(bitmask<24)\r
- {\r
- strcat(outip,".0");\r
- bitmask+=8;\r
- }\r
- /* debug printf("[%s]\n",outip); */\r
- return outip;\r
- }\r
- }\r
- else \r
- {\r
- *outptr=*ip;\r
- outptr++;\r
- }\r
- ip++;\r
- }\r
- /*should never exit here*/\r
- *outptr='\0';\r
- return outip;\r
-}\r
-\r
-char *hash_id(char *ip,int bitmask)\r
-{ \r
- return very_ugly_ipv4_code(ip,bitmask,1);\r
-}\r
+char *index_id(char *ip, int bitmask);\r
+/* function implemented in ipv4subnets.c */\r
\r
-char *subnet_id(char *ip,int bitmask)\r
-{\r
- return very_ugly_ipv4_code(ip,bitmask,0);\r
-}\r
+char *subnet_id(char *ip, int bitmask);\r
+/* function implemented in ipv4subnets.c */\r
\r
-/* ================= Let's parse configuration file here =================== */\r
+/* ================= Let's parse configuration file here ================ */\r
\r
void reject_config_and_exit(char *filename)\r
{\r
keyword->leaf_discipline="";\r
\r
push(keyword,keywords);\r
- if(!defaultkeyword) defaultkeyword=keyword;\r
+ if(!defaultkeyword)\r
+ {\r
+ defaultkeyword=keyword;\r
+ }\r
keywordcount++;\r
\r
kwd=NULL;\r
option("iptables",iptables);\r
option("iptables-save",iptablessave); /* new */\r
option("iptables-restore",iptablesrestore); /* new */\r
- option("iptables-file",iptablesfile); /* new */\r
+ option("ip6tables",ip6tables);\r
+ option("ip6tables-save",ip6tablessave); /* new */\r
+ option("ip6tables-restore",ip6tablesrestore); /* new */\r
+ option("iptables-in-filename",iptablesfile); /* new */\r
option("hosts",hosts);\r
option("lan-interface",lan);\r
option("wan-interface",wan);\r
ioption("hall-of-fame-enable",hall_of_fame);\r
option("hall-of-fame-title",title);\r
option("hall-of-fame-filename",html);\r
+ option("json-filename",json_traffic);\r
option("hall-of-fame-preview",preview);\r
+ option("json-preview",json_preview);\r
option("log-filename",cmdlog);\r
option("credit-filename",credit);\r
+ option("classmap-filename",classmap);\r
ioption("credit-enable",enable_credit);\r
option("log-traffic-directory",log_dir);\r
option("log-traffic-html-directory",html_log_dir);\r
option("log-traffic-url-path",log_url);\r
+ option("jquery-url",jquery_url);\r
+ option("lms-url",lms_url);\r
+ ioption("use-jquery-popups",use_jquery_popups);\r
option("qos-free-zone",qos_free_zone);\r
ioption("qos-free-delay",qos_free_delay);\r
ioption("qos-proxy-enable",qos_proxy);\r
ioption("htb-r2q",htb_r2q);\r
ioption("magic-include-upload",include_upload);\r
ioption("magic-treshold",magic_treshold); \r
- option("filter-type", cnf);\r
- \r
+ option("filter-type", cnf); \r
/* not yet implemented:\r
ioption("magic-fixed-packets",fixed_packets);\r
ioption("magic-relative-packets",packet_limit);\r
perror(config_filename);\r
puts("Warning - using built-in defaults instead ...");\r
}\r
- done;\r
+ done; /* ugly macro end */\r
printf("\n");\r
\r
- /*leaf discipline for keywords*/\r
+ /* leaf discipline for keywords */\r
for_each(keyword,keywords)\r
{\r
- if (!strcmpi(keyword->leaf_discipline, ""))\r
+ if(!strcmpi(keyword->leaf_discipline, ""))\r
{\r
keyword->leaf_discipline = qos_leaf;\r
}\r
}\r
\r
- if (strcmpi(cnf, "mark"))\r
+ if(strcmpi(cnf, "mark"))\r
{\r
filter_type = 2;\r
mark = "CLASSIFY";\r
}\r
}\r
\r
-/* ===================== traffic analyser - uses iptables ================ */ \r
-\r
-void get_traffic_statistics(void)\r
-{\r
- char *str,*cmd;\r
- int downloadflag=0;\r
-\r
- textfile(Pipe,str) *line,*lines=NULL;\r
- string(str,STRLEN);\r
- string(cmd,STRLEN);\r
-\r
- sprintf(cmd,"%s -L -v -x -n -t mangle",iptables);\r
- shell(cmd);\r
- input(str,STRLEN)\r
- {\r
- create(line,Pipe);\r
- line->str=str;\r
- string(str,STRLEN);\r
- append(line,lines);\r
- }\r
-\r
- for_each(line,lines)\r
- {\r
- int col, accept=0,proxyflag=0,valid=1,setchainname=0,commonflag=0; \r
- unsigned long long traffic=0;\r
- unsigned long pkts=0;\r
- char *ipaddr=NULL,*ptr;\r
- \r
- /* debug puts(line->str); */\r
- valid_columns(ptr,line->str,' ',col) \r
- if(valid) switch(col)\r
- { \r
- case 1: if(eq(ptr,"Chain"))\r
- setchainname=1;\r
- else if(eq(ptr,"pkts")) \r
- valid=0;\r
- else\r
- sscanf(ptr,"%lu",&pkts); \r
- break;\r
- case 2: if(setchainname)\r
- {\r
- if(!strncmp(ptr,"post_",5) || eq(ptr,"POSTROUTING"))\r
- downloadflag=1; \r
- else \r
- if(!strncmp(ptr,"forw_",5) || eq(ptr,"FORWARD"))\r
- downloadflag=0;\r
- \r
- if(eq(ptr,"post_common") || eq(ptr,"forw_common"))\r
- commonflag=1;\r
- }\r
- else\r
- sscanf(ptr,"%Lu",&traffic); traffic+=(1<<19); traffic>>=20;\r
- break;\r
- case 3: if((strncmp(ptr,"post_",5) && strncmp(ptr,"forw_",5)) || commonflag)\r
- accept=eq(ptr,mark);\r
- /*if (filter_type==1) accept=eq(ptr,"MARK"); else accept=eq(ptr,"CLASSIFY");*/\r
- break;\r
- case 8: if(downloadflag)\r
- { \r
- if(strstr(proxy_ip,ptr))proxyflag=1; \r
- }\r
- else\r
- ipaddr=ptr; \r
- break;\r
- case 9: if(downloadflag)ipaddr=ptr;break;\r
- }\r
- \r
- if(accept && traffic>0 && ipaddr)\r
- {\r
- if(proxyflag)\r
- {\r
- printf("(proxy) ");\r
- }\r
- else if(!downloadflag)\r
- {\r
- printf("(upload) ");\r
- }\r
- printf("IP %s: %Lu M (%ld pkts)\n", ipaddr, traffic, pkts);\r
-\r
- if_exists(ip,ips,eq(ip->addr,ipaddr)); \r
- else \r
- {\r
- TheIP();\r
- ip->addr=ipaddr;\r
- if(eq(ip->addr,"0.0.0.0/0"))\r
- {\r
- ip->name="(unregistered)";\r
- ip->min=free_min;\r
- ip->max=ip->desired=free_max;\r
- }\r
- }\r
- \r
- if(downloadflag)\r
- {\r
- if(proxyflag)\r
- {\r
- ip->proxy=traffic;\r
- }\r
- else\r
- {\r
- ip->traffic+=traffic;\r
- }\r
- ip->direct=ip->traffic-ip->upload-ip->proxy;\r
- ip->pktsdown=pkts;\r
- }\r
- else\r
- {\r
- ip->upload=traffic;\r
- ip->pktsup=pkts;\r
- if(include_upload)\r
- {\r
- ip->traffic+=traffic;\r
- }\r
- else \r
- {\r
- if(traffic>ip->traffic)\r
- {\r
- ip->traffic=traffic; \r
- }\r
- }\r
- }\r
- } \r
- }\r
-\r
- free(cmd);\r
-}\r
\r
/* ========== This function executes, logs OR ALSO prints command ========== */\r
\r
\r
void run_restore(void)\r
{\r
- char *restor, *str;\r
+ char *restor;\r
string(restor,STRLEN);\r
\r
/*-----------------------------------------------------------------*/\r
- printf("Running %s <%s ...\n",iptablesrestore,iptablesfile);\r
+ printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);\r
/*-----------------------------------------------------------------*/\r
\r
save_line("COMMIT");\r
{\r
printf("%s\n",_);\r
}\r
- done;\r
+ done; /* ugly macro end */\r
}\r
\r
sprintf(restor,"%s <%s",iptablesrestore, iptablesfile);\r
free(restor);\r
}\r
\r
-/* == This function strips extra characters after IP address and stores it = */\r
-\r
-void parse_ip(char *str)\r
-{\r
- char *ptr,*ipaddr=NULL,*ipname=NULL,*lmsid=NULL;\r
-\r
- ptr=strchr(str,'{');\r
- if(ptr)\r
- {\r
- lmsid=++ptr;\r
- while(*ptr && *ptr!='}')\r
- {\r
- ptr++;\r
- }\r
- *ptr=0;\r
- }\r
- \r
- ptr=str;\r
- while(*ptr && *ptr!=' ' && *ptr!=9)\r
- {\r
- ptr++;\r
- }\r
- \r
- *ptr=0;\r
- ipaddr=str;\r
- ptr++;\r
- while(*ptr && (*ptr==' ' || *ptr==9))\r
- {\r
- ptr++;\r
- }\r
- ipname=ptr; \r
- while(*ptr && *ptr!=' ' && *ptr!=9)\r
- {\r
- ptr++;\r
- }\r
- *ptr=0;\r
-\r
- if_exists(ip,ips,eq(ip->addr,ipaddr));\r
- else\r
- {\r
- TheIP();\r
- }\r
- ip->addr=ipaddr;\r
- ip->name=ipname;\r
- if(lmsid)\r
- {\r
- ip->lmsid=atoi(lmsid);\r
- found_lmsid=1;\r
- }\r
-}\r
-\r
char *parse_datafile_line(char *str)\r
{\r
char *ptr=strchr(str,' ');\r
}\r
}\r
\r
-struct IpLog\r
-{\r
- char *name;\r
- long traffic;\r
- long guaranted;\r
- int i;\r
- int lmsid;\r
- long l;\r
- list(IpLog);\r
-} *iplog,*iplogs;\r
-\r
-void parse_ip_log(int argc, char **argv) \r
-{\r
- char *month, *year, *str, *name="(undefined)", *ptr, *ptr2, *filename;\r
- long traffic=0l, traffic_month, total=0, guaranted;\r
- int col, col2, y_ok, m_ok, accept_month, i=1, any_month=0, lmsid;\r
- char mstr[4], ystr[5];\r
- FILE *f; \r
- string(str,STRLEN);\r
- string(filename,STRLEN);\r
-\r
- if(argv[1][1]=='l') /* -l */\r
- {\r
- if(argc<4)\r
- {\r
- puts("Missing parameter(s)!\nUsage: prometheus -l Mmm YYYY (Mmm=Jan-Dec or Year, YYYY=year)");\r
- exit(-1);\r
- }\r
- else\r
- {\r
- month=argv[2];\r
- if(eq(month,"Year")) any_month=1;\r
- year=argv[3];\r
- }\r
- }\r
- else\r
- { \r
- time_t t = time(NULL) - 3600*24 ; /* yesterday's timestamp*/\r
- struct tm *timep = localtime(&t); \r
-\r
- if(argv[1][1]=='m') /* -m yestarday - month */\r
- {\r
- strftime(mstr, 4, "%b", timep);\r
- month=mstr;\r
- strftime(ystr, 5, "%Y", timep);\r
- year=ystr; \r
- }\r
- else /* -y yesterday - year */\r
- {\r
- month="Year";\r
- any_month=1;\r
- strftime(ystr, 5, "%Y", timep);\r
- year=ystr;\r
- }\r
- }\r
- printf("Analysing traffic for %s %s ...\n",month,year);\r
-\r
- /* sorry... next release of C<<1 header file will include for_path_files(name,path) { } macro */\r
- sprintf(str,"%s %s/",ls,log_dir);\r
- shell(str);\r
- input(str,STRLEN) \r
- {\r
- if(strstr(str,".log"))\r
- {\r
- ptr=strrchr(str,'\n');\r
- if(ptr) *ptr='\0';\r
- sprintf(filename,"%s/%s",log_dir,str);\r
- printf("Parsing %s ...",filename);\r
- accept_month=0;\r
- traffic_month=0;\r
- guaranted=0;\r
- lmsid=-1;\r
- parse(filename)\r
- {\r
- y_ok=m_ok=0; \r
- valid_columns(ptr,_,'\t',col) switch(col)\r
- {\r
- case 2: name = ptr;break;\r
- case 3: traffic = atol(ptr);break;\r
- /* column number - was 7, now 11...*/\r
- case 7:\r
- case 8:\r
- case 9:\r
- case 10:\r
- case 11: if (isalpha(*ptr)) /* character, not numeric string = date, just one*/\r
- {\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
- else\r
- {\r
- if(col == 7) guaranted = atol(ptr);\r
- if(col == 10) lmsid = atoi(ptr);\r
- }\r
- }\r
- \r
- if(y_ok && m_ok) \r
- {\r
- traffic_month += traffic;\r
- accept_month = 1;\r
- }\r
- }\r
- done;\r
-\r
- if(accept_month)\r
- {\r
- create(iplog,IpLog);\r
- iplog->name = name;\r
- iplog->guaranted = guaranted;\r
- iplog->traffic = traffic_month;\r
- iplog->lmsid = lmsid;\r
- insert(iplog,iplogs,desc_order_by,traffic);\r
- printf(" %ld MB\n",iplog->traffic);\r
- }\r
- else\r
- {\r
- puts(" no records.");\r
- }\r
- }\r
- }\r
- sprintf(str,"%s/%s-%s.html",html_log_dir,year,month);\r
- printf("Writing %s ...",str);\r
- f=fopen(str,"w");\r
- if(f)\r
- {\r
- fprintf(f,"<table border><tr><th colspan=\"2\">%s %s</th><th align=\"right\">lms</th><th colspan=\"2\">Data transfers</th><th align=\"right\">Min.speed</th></tr>\n ",month,year);\r
-\r
- for_each(iplog,iplogs)\r
- {\r
- if(iplog->traffic)\r
- {\r
- fprintf(f,"<tr><td align=\"right\">%d</td><th align=\"left\">%s</td><td align=\"right\">", i++, iplog->name); \r
- if(iplog->lmsid > 0)\r
- {\r
- /*base URL will be configurable soon ... */\r
- fprintf(f,"<a href=\"https://hermes.spoje.net/?m=customerinfo&id=%d\">%04d</a>\n", iplog->lmsid, iplog->lmsid);\r
- }\r
- else if(iplog->lmsid == 0)\r
- {\r
- fputs("-------",f);\r
- } \r
- fprintf(f,"<td align=\"right\">%ld M</td><th align=\"right\">%ld G</th><td align=\"right\">%ld kbps</th></tr>\n",\r
- iplog->traffic, iplog->traffic>>10, iplog->guaranted);\r
- total+=iplog->traffic>>10;\r
- iplog->i=i;\r
- iplog->l=total;\r
- }\r
- }\r
- fprintf(f,"<tr><th colspan=\"4\" align=\"left\">Total:</th><th align=\"right\">%ld GB</th><th align=\"right\">%Ld kbps</th></tr>\n", total, line);\r
- fputs("</table>\n", f);\r
-\r
- if(i>10)\r
- {\r
- fputs("<a name=\"erp\"></a><p><table border><tr><th colspan=\"5\">Enterprise Research and Planning (ERP)</th></tr>\n",f);\r
- fputs("<tr><td>Analytic category</td>\n",f);\r
- fputs("<td colspan=\"2\" align=\"center\">Active Classes</td><td colspan=\"2\" align=\"center\">Data transfers</td></tr>\n",f);\r
-\r
- if_exists(iplog,iplogs,iplog->l>=total/4)\r
- {\r
- fprintf(f,"<tr><td>Top 25%% of traffic</td>\n");\r
- fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><td align=\"right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
- }\r
- \r
- if_exists(iplog,iplogs,iplog->i==10)\r
- {\r
- fprintf(f,"<tr><td>Top 10 downloaders</td>\n");\r
- fprintf(f,"<th align=\"right\">10</th><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><td align=\"right\">%d %%</td></tr>\n",(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
- }\r
-\r
- if_exists(iplog,iplogs,iplog->l>=total/2)\r
- {\r
- fprintf(f,"<tr><td>Top 50%% of traffic</td>\n");\r
- fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><th align=\"right\">%d %%</th></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
- }\r
-\r
- if_exists(iplog,iplogs,iplog->l>=4*total/5)\r
- {\r
- fprintf(f,"<tr><td>Top 80%% of traffic</td>\n");\r
- fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><th align=\"right\">%d %%</th></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
- }\r
-\r
- if_exists (iplog,iplogs,iplog->i>=i/5)\r
- {\r
- fprintf(f,"<tr><td>Top 20%% downloaders</td>\n");\r
- fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%ld G</td><td align=\"right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
- }\r
-\r
- if_exists(iplog,iplogs,iplog->i>=i/4)\r
- {\r
- fprintf(f,"<tr><td>Top 25%% downloaders</td>\n");\r
- fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><td align=\"right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
- }\r
-\r
- if_exists(iplog,iplogs,iplog->i>=i/2)\r
- {\r
- fprintf(f,"<tr><td>Top 50%% downloaders</td>\n");\r
- fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%ld G</td><td align=\"right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
- }\r
-\r
- if_exists(iplog,iplogs,iplog->i>=4*i/5)\r
- {\r
- fprintf(f,"<tr><td>Top 80%% downloaders</td>\n");\r
- fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%ld G</td><td align=\"right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));\r
- }\r
-\r
- fprintf(f,"<tr><td>All users, all traffic</td>\n");\r
- fprintf(f,"<th align=\"right\">%d</th><th align=\"right\">100 %%</th><th align=\"right\">%ld G</th><th align=\"right\">100 %%</th></tr>\n",i-1,total);\r
- fputs("</table>\n", f);\r
- }\r
-\r
- fprintf(f, stats_html_signature, version);\r
- fclose(f);\r
- puts(" done.");\r
- }\r
-}\r
\r
/*-----------------------------------------------------------------*/\r
/* Are you looking for int main(int argc, char **argv) ? :-)) */\r
\r
program\r
{\r
- int i=0;\r
- FILE *f=NULL;\r
- char *str, *ptr, *d;\r
+ int i=0; /* just plain old Fortran style integer :-) */\r
+ FILE *f=NULL; /* everything is just stream of bytes... */\r
+ char *str, *ptr, *d; /* LET A$=B$ :-) */\r
char *substring;\r
- int class_count=0,ip_count=0;\r
- int parent=1;\r
- int just_flush=FALSE;\r
- int nodelay=FALSE;\r
- int just_preview=FALSE; /* preview - generate just stats */\r
- int just_logs=FALSE; /* just parse logs */\r
- int run=FALSE;\r
+\r
+ int parent = 1;\r
+ int just_flush = FALSE; /* deactivates all previous actions */\r
+ int nodelay = FALSE;\r
+ int just_preview = FALSE; /* preview - generate just stats */\r
+ int start_shaping = FALSE; /* apply FUP - requires classmap file */\r
+ int just_logs = FALSE; /* just parse logs */\r
+ int run = FALSE;\r
+ int total = 0;\r
\r
char *chain_forward, *chain_postrouting;\r
char *althosts=NULL;\r
\r
printf("\n\\r
Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\\r
-Version %s - Copyright (C)2005-2011 Michael Polak (xChaos)\n\\r
+Version %s - Copyright (C)2005-2012 Michael Polak, Arachne Labs\n\\r
iptables-restore & burst tunning & classify modification by Ludva\n\\r
Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);\r
\r
- /*----- Boring... we have to check command line options first: ----*/\r
- \r
+ /*----- Boring... we have to check command line options first: ----*/ \r
arguments\r
{\r
argument("-c") { nextargument(config); }\r
argument("-f") { run=TRUE; just_flush=TRUE; }\r
argument("-9") { run=TRUE; just_flush=9; }\r
argument("-p") { run=TRUE; just_preview=TRUE; }\r
+ argument("-s") { run=TRUE; just_preview=TRUE; start_shaping=TRUE; }\r
argument("-r") { run=TRUE; }\r
argument("-n") { run=TRUE; nodelay=TRUE; }\r
argument("-l") { just_logs=TRUE; }\r
/*-----------------------------------------------------------------*/\r
puts("Parsing iptables verbose output ...");\r
/*-----------------------------------------------------------------*/\r
- get_traffic_statistics();\r
+ get_traffic_statistics(iptables);\r
}\r
\r
/*-----------------------------------------------------------------*/\r
printf("Parsing class defintion file %s ...\n", hosts);\r
/*-----------------------------------------------------------------*/\r
- int groupidx = FIRSTGROUPID;\r
- parse(hosts)\r
- {\r
- str=_;\r
-\r
- if(*str<'0' || *str>'9')\r
- {\r
- /* any line starting with non-number is comment ...*/\r
- continue;\r
- }\r
- \r
- //Does this IP share QoS class with some other ?\r
- substring=strstr(str,"sharing-");\r
- if(substring)\r
- { \r
- substring+=8; //"sharing-"\r
- parse_ip(str);\r
- ip_count++;\r
- ip->sharing=substring;\r
- ip->keyword=defaultkeyword; /* settings for default keyword */\r
- while(*substring && *substring!='\n')\r
- {\r
- substring++;\r
- }\r
- *substring=0; \r
- }\r
- else\r
- {\r
- //Do we have to create new QoS class for this IP ?\r
-\r
- if_exists(keyword,keywords,(substring=strstr(str,keyword->key)))\r
- {\r
- parse_ip(str);\r
- ip_count++;\r
- ip->keyword=keyword;\r
- keyword->ip_count++;\r
- ip->prio=keyword->default_prio;\r
- substring+=strlen(keyword->key)+1;\r
- ptr=substring;\r
- while(*ptr && *ptr!='-')\r
- {\r
- ptr++;\r
- }\r
- if(*ptr=='-')\r
- {\r
- *ptr=0;\r
- ip->max=ip->desired=atoi(ptr+1);\r
- }\r
- ip->min=atoi(substring);\r
- if(ip->min<=0)\r
- {\r
- printf(" %s: Illegal value of minimum bandwidth 0 kbps, using %d kbps\n",str,free_min);\r
- ip->min=free_min;\r
- }\r
- if(ip->max<=ip->min)\r
- {\r
- ip->fixedprio=1;\r
- ip->max=ip->min+ip->keyword->reserve_min;\r
- }\r
- else \r
- {\r
- ip->max-=ip->keyword->reserve_max;\r
- if(ip->max<ip->min)\r
- {\r
- ip->max=ip->min;\r
- }\r
- }\r
- ip->mark=FIRSTIPCLASS+1+class_count++;\r
-\r
- if_exists(group,groups,group->min==ip->min) \r
- { \r
- group->count++; \r
- group->desired+=ip->min;\r
- ip->group = group->id; \r
- }\r
- else\r
- {\r
- create(group,Group);\r
- group->min=ip->min;\r
- group->id = groupidx++;\r
- ip->group = group->id;\r
-\r
- if(group->min<8) group->min=8;\r
- /* Warning - this is maybe because of primitive tc namespace, can be fixed */\r
- /* it is because class IDs are derived from min. bandwidth. - xCh */\r
- //if(group->min>MAX_GUARANTED_KBPS) group->min=MAX_GUARANTED_KBPS;\r
- \r
- group->count=1;\r
- group->desired=ip->min; \r
- insert(group,groups,desc_order_by,min);\r
- }\r
- }//endif keyword-\r
- }//endif sharing-\r
- }\r
- fail\r
- {\r
- perror(hosts);\r
- exit(-1);\r
- }\r
- done;\r
+ parse_hosts(hosts);\r
\r
/*-----------------------------------------------------------------*/\r
/* cll1.h - let's allocate brand new character buffer... */\r
/*-----------------------------------------------------------------*/\r
puts("Resolving shared connections ...");\r
/*-----------------------------------------------------------------*/\r
- for_selected(ip,ips,ip->sharing)\r
+ for_each(ip,ips) if(ip->sharing)\r
{\r
- for_selected(sharedip,ips,eq(sharedip->name,ip->sharing))\r
+ for_each(sharedip,ips) if(eq(sharedip->name,ip->sharing))\r
{\r
sharedip->traffic+=ip->traffic;\r
ip->traffic=0;\r
ip->lmsid=sharedip->lmsid;\r
break;\r
}\r
- if(!sharedip)\r
+ if(not sharedip)\r
{\r
- printf("Unresolved shared connection: %s %s sharing-%s\n",ip->addr,ip->name,ip->sharing);\r
+ printf("Unresolved shared connection: %s %s sharing-%s\n",\r
+ ip->addr, ip->name, ip->sharing);\r
}\r
}\r
\r
}\r
}\r
}\r
- done;\r
+ done; /* ugly macro end */\r
}\r
\r
if(!just_preview)\r
/*-----------------------------------------------------------------*/\r
\r
iptables_file=fopen(iptablesfile,"w");\r
- if (iptables_file == NULL)\r
+ if(iptables_file == NULL)\r
{\r
puts("Cannot open iptablesfile!");\r
exit(-1);\r
}\r
\r
log_file=fopen(cmdlog,"w");\r
- if (log_file == NULL) \r
+ if(log_file == NULL) \r
{\r
puts("Cannot open logfile!");\r
exit(-1);\r
if(qos_proxy)\r
{\r
save_line(":post_noproxy - [0:0]");\r
- sprintf(str,"-A POSTROUTING -p ! tcp -o %s -j post_noproxy", lan);\r
+ sprintf(str,"-A POSTROUTING ! -p tcp -o %s -j post_noproxy", lan);\r
save_line(str); \r
- sprintf(str,"-A POSTROUTING -s ! %s -o %s -j post_noproxy", proxy_ip, lan);\r
+ sprintf(str,"-A POSTROUTING ! -s %s -o %s -j post_noproxy", proxy_ip, lan);\r
save_line(str); \r
- sprintf(str,"-A POSTROUTING -s %s -p tcp --sport ! %d -o %s -j post_noproxy", proxy_ip, proxy_port, lan);\r
+ sprintf(str,"-A POSTROUTING -s %s -p tcp ! --sport %d -o %s -j post_noproxy", proxy_ip, proxy_port, lan);\r
save_line(str); \r
\r
chain="post_noproxy"; \r
save_line(":post_common - [0:0]");\r
save_line(":forw_common - [0:0]");\r
\r
- for_selected(ip,ips,ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0"))\r
+ for_each(ip,ips) if(ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0"))\r
{\r
- buf=hash_id(ip->addr,bitmask);\r
+ buf=index_id(ip->addr,bitmask);\r
if_exists(idx,idxs,eq(idx->id,buf))\r
{\r
idx->children++;\r
bitmask-=idxtable_bitmask2;\r
idxcount=0;\r
\r
- for_selected(idx,idxs,idx->parent==NULL)\r
+ for_each(idx,idxs) if(idx->parent == NULL)\r
{\r
- buf=hash_id(idx->addr,bitmask);\r
+ buf=index_id(idx->addr,bitmask);\r
if_exists(metaindex,idxs,eq(metaindex->id,buf))\r
{\r
metaindex->children++;\r
for_each(idx,idxs)\r
{\r
subnet=subnet_id(idx->addr,idx->bitmask);\r
- printf("%d: %s/%d\n",++i,subnet,idx->bitmask);\r
+ printf("%d: %s/%d\n",\r
+ ++i, subnet, idx->bitmask);\r
\r
sprintf(str,":post_%s - [0:0]", idx->id);\r
save_line(str);\r
if(just_flush)\r
{\r
fclose(iptables_file);\r
- if (log_file) fclose(log_file);\r
+ if(log_file)\r
+ { \r
+ fclose(log_file);\r
+ }\r
puts("Just flushed iptables and tc classes - now exiting ...");\r
exit(0);\r
}\r
sleep(qos_free_delay);\r
}\r
\r
- sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",tc,lan,htb_r2q);\r
+ sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",\r
+ tc,lan,htb_r2q);\r
safe_run(str);\r
\r
sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d",\r
/*-----------------------------------------------------------------*/\r
/* sub-scope - local variables */ \r
{\r
- long long int rate=line;\r
- long long int max=line;\r
- int group_count=0;\r
- FILE *credit_file=NULL;\r
+ long long int rate = line;\r
+ long long int max = line;\r
+ int group_count = 0;\r
+ FILE *credit_file = NULL;\r
\r
if(!just_preview && !dry_run && enable_credit)\r
{\r
- credit_file=fopen(credit,"w");\r
+ credit_file = fopen(credit,"w");\r
}\r
\r
for_each(group,groups)\r
safe_run(str);\r
}\r
\r
- if(group_count++<max_nesting)\r
+ if(group_count++ < max_nesting)\r
{\r
- parent=group->id;\r
+ parent = group->id;\r
}\r
\r
- rate-=digital_divide*group->min;\r
- if(rate<group->min)\r
+ rate -= digital_divide*group->min;\r
+ if(rate < group->min)\r
{\r
- rate=group->min;\r
+ rate = group->min;\r
}\r
\r
/*shaping of aggresive downloaders, with credit file support */\r
if(use_credit)\r
{\r
- int group_rate=group->min, priority_sequence=lowest_priority;\r
+ int group_rate = group->min, priority_sequence = lowest_priority;\r
\r
- for_selected(ip, ips, ip->min==group->min && ip->max>ip->min)\r
+ for_each(ip, ips) if(ip->min == group->min && ip->max > ip->min)\r
{\r
- if( ip->keyword->data_limit && !ip->fixedprio &&\r
- ip->traffic>ip->credit+\r
- (ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)) )\r
+ ip->realquota=ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20));\r
+ if( ip->keyword->data_limit \r
+ and not ip->fixedprio \r
+ and ip->traffic > ip->realquota )\r
{\r
- if(group_rate<ip->max)\r
+ if(group_rate < ip->max)\r
{\r
- ip->max=group_rate;\r
+ ip->max = group_rate;\r
}\r
group_rate+=magic_treshold;\r
ip->prio=lowest_priority;\r
}\r
else\r
{\r
- if( ip->keyword->data_prio && !ip->fixedprio &&\r
- ip->traffic>ip->credit+\r
- (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20)) )\r
+ if( ip->keyword->data_prio \r
+ && !ip->fixedprio \r
+ && ( ip->traffic>ip->credit\r
+ + (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20))) )\r
{\r
ip->prio=priority_sequence--;\r
if(ip->prio<highest_priority+1)\r
fprintf(credit_file,"%s %Lu\n",ip->addr,lcredit);\r
}\r
}\r
- }\r
- \r
+ } \r
}\r
}\r
if(credit_file)\r
\r
if(just_preview)\r
{\r
- f=fopen(preview,"w");\r
- ptr=preview; \r
- }\r
- else if(!dry_run && !just_flush)\r
- {\r
- /*-----------------------------------------------------------------*/\r
- printf("Writing data transfer database ...\n");\r
- /*-----------------------------------------------------------------*/\r
- f=fopen("/var/run/prometheus.previous","w");\r
- if(f)\r
+ if(start_shaping)\r
{\r
- for_selected(ip,ips,ip->traffic || ip->direct || ip->proxy ||ip->upload)\r
- fprintf(f,"%s %Lu %Lu %Lu %Lu\n",ip->addr,ip->traffic,ip->direct,ip->proxy,ip->upload);\r
- fclose(f);\r
+ printf("Reading %s and applying Fair Use Policy rules ... \n", classmap);\r
+ parse(classmap)\r
+ {\r
+ ptr=strchr(_,' ');\r
+ if(ptr)\r
+ {\r
+ *ptr=0;\r
+ ptr++;\r
+ if_exists(ip,ips,eq(ip->addr,_))\r
+ {\r
+ ip->mark=atoi(ptr);\r
+ if(ip->max < ip->desired) /* apply FUP limit immediately.... */\r
+ {\r
+ printf("Applying limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark); \r
+ printf("(down: %dk-%dk ", ip->min, ip->max); \r
+ sprintf(str, "%s class change dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", \r
+ tc, lan, ip->group, ip->mark,ip->min,ip->max, burst, ip->prio);\r
+ safe_run(str);\r
+ printf("up: %dk-%dk)\n", (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), \r
+ (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed));\r
+ sprintf(str,"%s class change dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
+ tc, wan, ip->group, ip->mark,\r
+ (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),\r
+ (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio);\r
+ safe_run(str);\r
+ }\r
+ }\r
+ }\r
+ }\r
+ fail\r
+ { \r
+ perror(classmap);\r
+ puts("Warning - classmap file not fund, just generating preview ...");\r
+ start_shaping=FALSE;\r
+ }\r
+ done; /* ugly macro end */\r
}\r
-\r
- f=fopen(html,"w");\r
- ptr=html;\r
+ html=preview;\r
+ json_traffic=json_preview;\r
}\r
\r
- if(f)\r
+ if(!dry_run && !just_flush)\r
{\r
- int total=0;\r
- int count=1;\r
- i=0;\r
-\r
/*-----------------------------------------------------------------*/\r
- printf("Sorting data and generating statistics page %s ...\n",ptr);\r
+ printf("Writing json traffic overview %s ... ", json_traffic);\r
/*-----------------------------------------------------------------*/\r
-\r
- fputs("<table border>\n<tr><th align=\"right\">#</th><th align=\"right\">group</th><th align=\"right\">IPs</th><th align=\"right\">requested</th>\n",f);\r
- fprintf(f,"<th colspan=\"%d\">data limits</th>\n",keywordcount);\r
- fputs("</tr>\n",f);\r
-\r
- for_each(group,groups) \r
- { \r
-#ifdef DEBUG\r
- printf("%d k group: %d bandwidth requested: %d k\n",group->min,group->count,group->desired);\r
-#endif\r
- fprintf(f,"<tr><td align=\"right\">%d</td><td align=\"right\">%d k</td>",count,group->min);\r
- fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d k</td>",group->count,group->desired);\r
-\r
- for_each(keyword,keywords)\r
- {\r
- fprintf(f,"<td align=\"right\"><font color=\"#%s\">%d M</font></td>",keyword->html_color,group->min*keyword->data_limit);\r
- } \r
- i+=group->desired; \r
- total+=group->count;\r
- count++; \r
- }\r
-#ifdef DEBUG\r
- printf("Total groups: %d Total bandwidth requested: %d k\nAGGREGATION: 1/%d\n",count,i,i/line);\r
-#endif\r
- fprintf(f,"<tr><th colspan=\"2\" align=\"left\">Line %Ld k</td>",line);\r
- fprintf(f,"<th align=\"right\">%d</td><th align=\"right\">%d k</td>",total,i);\r
-\r
- for_each(keyword,keywords)\r
- {\r
- fprintf(f,"<th align=\"right\">%d IPs</th>",keyword->ip_count);\r
- }\r
- fprintf(f,"</tr><tr><th colspan=\"4\">Aggregation 1/%d</th>\n",(int)(0.5+i/line));\r
- fprintf(f,"<th colspan=\"%d\">%d traffic classes</th></tr>\n",keywordcount,total);\r
-\r
- fputs("</table>\n",f);\r
+ write_json_traffic(json_traffic);\r
}\r
- else if(!dry_run && !just_flush) \r
- perror(html);\r
\r
- i=1;\r
- if(f)\r
- {\r
- unsigned long long total=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;\r
- int active_classes=0;\r
- int colspan;\r
- FILE *iplog;\r
- struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums=NULL;\r
+ /*-----------------------------------------------------------------*/\r
+ printf("Writing statistics into HTML page %s ...\n", html);\r
+ /*-----------------------------------------------------------------*/\r
+ write_htmlandlogs(html, d,total, just_preview);\r
\r
- colspan=11;\r
- if(qos_proxy)\r
- {\r
- colspan++;\r
- }\r
- if(found_lmsid)\r
- {\r
- colspan++;\r
- }\r
- \r
- fprintf(f,"<p><table border>\n<tr><th colspan=\"%d\">%s",colspan,title);\r
- fprintf(f," (%s)</th></tr>\n", d);\r
- fputs("<tr><td align=\"right\">#</td><td>hostname</td>",f);\r
- if(found_lmsid)\r
- {\r
- fputs("<td align=\"right\">lms</td>\n",f);\r
- }\r
- fputs("<td align=\"right\">credit</td>\\r
-<td align=\"right\">limit</td>\\r
-<td align=\"right\">total</td>\\r
-<td align=\"right\">direct</td>\n",f);\r
- if(qos_proxy)\r
+ if(just_preview)\r
+ {\r
+ char swchar='p';\r
+ if(start_shaping)\r
{\r
- fputs("<td align=\"right\">proxy</td>\n",f);\r
+ swchar='s';\r
}\r
- fputs("<td align=\"right\">upload</td>\\r
-<td align=\"right\">minimum</td>\\r
-<td align=\"right\">desired</td>\\r
-<td align=\"right\">maximum</td>\\r
-<td>prio</td></tr>\n",f); \r
-\r
- for_each(ip,ips)\r
- {\r
- char *f1="", *f2="";\r
- if(ip->max<ip->desired)\r
- {\r
- f1="<font color=\"red\">";\r
- f2="</font>";\r
- }\r
- else if(ip->prio>highest_priority+1)\r
- {\r
- f1="<font color=\"brown\">";\r
- f2="</font>";\r
- }\r
+ printf("Statistics preview generated (-%c switch) - now exiting ...\n", swchar);\r
+ exit(0);\r
+ } \r
\r
+ i=0;\r
#ifdef DEBUG\r
- printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); \r
+ printf("%-22s %-15s mark\n","name","ip");\r
#endif\r
- fprintf(f,"<tr><td align=\"right\"><a name=\"%s\"></a>%d</td><td><a href=\"%s%s.log\">%s</a></td>\n", ip->name, i, log_url, ip->name, ip->name);\r
- if(found_lmsid)\r
- {\r
- fputs("<td align=\"right\">",f);\r
- if(ip->lmsid > 0)\r
- {\r
- /*base URL will be configurable soon ... */\r
- fprintf(f,"<a href=\"https://hermes.spoje.net/?m=customerinfo&id=%d\">%04d</a>\n", ip->lmsid, ip->lmsid);\r
- }\r
- else if(ip->lmsid == 0)\r
- {\r
- fputs("-------",f);\r
- }\r
- fputs("</td>\n",f); \r
- }\r
- fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->credit);\r
- fprintf(f,"<td align=\"right\"><font color=\"#%s\">%Lu M</font></td>",\r
- ip->keyword->html_color, ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));\r
- fprintf(f,"<td align=\"right\">%s%Lu M%s</td><td align=\"right\">%Lu M</td>\n", f1, ip->traffic, f2, ip->direct);\r
- if(qos_proxy)\r
- {\r
- fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->proxy);\r
- }\r
- fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->upload);\r
- fprintf(f,"<td align=\"right\">%d k</td><td align=\"right\">%d k</td><td align=\"right\">%s%d k%s</td><td>%s%d%s</td></tr>\n",\r
- ip->min,ip->desired,f1,ip->max,f2,f1,ip->prio,f2);\r
- total+=ip->traffic;\r
- total_direct+=ip->direct;\r
- total_proxy+=ip->proxy;\r
- total_upload+=ip->upload;\r
- if(ip->traffic>0)\r
- {\r
- active_classes++;\r
- tmp_sum+=ip->traffic;\r
- create(sum,Sum);\r
- sum->l=tmp_sum;\r
- sum->i=active_classes;\r
- insert(sum,sums,order_by,i);\r
- }\r
- \r
- i++;\r
- \r
- if(!just_preview)\r
- {\r
- sprintf(str,"%s/%s.log",log_dir,ip->name);\r
- iplog=fopen(str,"a");\r
- if(iplog)\r
- {\r
- fprintf(iplog,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",\r
- time(NULL),ip->name,ip->traffic,ip->direct,ip->proxy,ip->upload,ip->min,ip->max,ip->desired,ip->lmsid,d); /* d = date*/\r
- fclose(iplog);\r
- }\r
- }\r
-\r
- }\r
- fprintf(f,"<tr><th colspan=\"%d\" align=\"left\">SUMMARY:</td>",colspan-7);\r
- fprintf(f,"<th align=\"right\">%Lu M</th>\\r
- <th align=\"right\">%Lu M</th>\n", total, total_direct);\r
- if(qos_proxy)\r
- {\r
- fprintf(f,"<th align=\"right\">%Lu M</th>\n", total_proxy);\r
- }\r
- fprintf(f,"<th align=\"right\">%Lu M</th>", total_upload);\r
- fputs("<td colspan=\"4\"></td></th>\n</table>\n",f);\r
-\r
- if(active_classes>10)\r
- {\r
- int top20_count=0,top20_perc1=0;\r
- long long top20_perc2=0;\r
- unsigned long long top20_sum=0l;\r
- \r
- fputs("<a name=\"erp\"></a><p><table border><tr><th colspan=\"5\">Enterprise Research and Planning (ERP)</th></tr>\n",f);\r
- fputs("<tr><td>Analytic category</td>\n",f);\r
- fputs("<td colspan=\"2\" align=\"center\">Active Classes</td><td colspan=\"2\" align=\"center\">Data transfers</td></tr>\n",f);\r
-\r
- if_exists(sum,sums,sum->l>=total/4)\r
- {\r
- fprintf(f,"<tr><td>Top 25%% of traffic</td>\n");\r
- fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
- }\r
- \r
- if_exists(sum,sums,sum->i==10)\r
- {\r
- fprintf(f,"<tr><td>Top 10 downloaders</td>\n");\r
- fprintf(f,"<th align=\"right\">10</th><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
- }\r
-\r
- if_exists(sum,sums,sum->l>=total/2)\r
- {\r
- fprintf(f,"<tr><td>Top 50%% of traffic</td>\n");\r
- fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><th align=\"right\">%Ld %%</th></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
- }\r
\r
- if_exists(sum,sums,sum->l>=4*total/5)\r
- {\r
- fprintf(f,"<tr><td>Top 80%% of traffic</td>\n");\r
- fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><th align=\"right\">%Ld %%</th></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
- }\r
-\r
- if_exists(sum,sums,sum->i>=(active_classes+1)/5)\r
- {\r
- fprintf(f,"<tr><td>Top 20%% downloaders</td>\n");\r
- top20_count=sum->i;\r
- top20_perc1=(100*sum->i+50)/active_classes;\r
- top20_sum=sum->l;\r
- top20_perc2=(100*sum->l+50)/total;\r
- fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",top20_count,top20_perc1,top20_sum,top20_perc2);\r
- }\r
-\r
- if_exists(sum,sums,sum->i>=(active_classes+1)/4)\r
- {\r
- fprintf(f,"<tr><td>Top 25%% downloaders</td>\n");\r
- fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
- }\r
-\r
- if_exists(sum,sums,sum->i>=(active_classes+1)/2)\r
- {\r
- fprintf(f,"<tr><td>Top 50%% downloaders</td>\n");\r
- fprintf(f,"<td align=\"right\">%d</td><th align=\"right\">%d %%</th><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
- }\r
-\r
- if_exists(sum,sums,sum->i>=4*(active_classes+1)/5)\r
- {\r
- fprintf(f,"<tr><td>Top 80%% downloaders</td>\n");\r
- fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d %%</td><td align=\"right\">%Lu M</td><td align=\"right\">%Ld %%</td></tr>\n",sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total);\r
- }\r
-\r
- fprintf(f,"<tr><td>All users, all traffic</td>\n");\r
- fprintf(f,"<th align=\"right\">%d</th><th align=\"right\">100 %%</th><th align=\"right\">%Lu M</th><th align=\"right\">100 %%</th></tr>\n",active_classes,total);\r
- fputs("</table>\n", f);\r
-\r
- /*write basic ERP data to log directory*/\r
- if(!just_preview)\r
- {\r
- sprintf(str,"%s/ERP.log",log_dir);\r
- iplog=fopen(str,"a");\r
- if(iplog)\r
- {\r
- fprintf(iplog,"%ld\t%d\t%d %%\t%Lu\t%Ld %%\t%d\t%Lu\t%s",\r
- time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, active_classes, total, d); /* d = date*/\r
- fclose(iplog);\r
- }\r
- }\r
- }\r
-\r
- fprintf(f, stats_html_signature, version);\r
- fclose(f);\r
- }\r
-\r
- if(just_preview)\r
+ printf("Writing %s ... ", classmap); \r
+ f = fopen(classmap, "w"); \r
+ if(f < 0)\r
{\r
- puts("Statistics preview generated (-p switch) - now exiting ...");\r
- exit(0);\r
+ perror(classmap);\r
}\r
- \r
+\r
/*-----------------------------------------------------------------*/\r
- puts("Generating iptables and tc classes ...");\r
+ puts("Generating iptables and tc classes ... ");\r
/*-----------------------------------------------------------------*/\r
\r
- i=0;\r
- printf("%-22s %-15s mark\n","name","ip");\r
-\r
- for_selected(ip,ips,ip->mark>0)\r
- { \r
- \r
+ for_each(ip, ips) if(ip->mark > 0)\r
+ {\r
if(idxs)\r
{\r
char *buf;\r
duplicate(ip->addr,buf);\r
- buf=hash_id(ip->addr,32-idxtable_bitmask1); \r
+ buf=index_id(ip->addr,32-idxtable_bitmask1); \r
\r
string(chain_forward,6+strlen(buf));\r
strcpy(chain_forward,"forw_");\r
chain_postrouting="POSTROUTING";\r
}\r
\r
+#ifdef DEBUG\r
printf("%-22s %-16s %04d ", ip->name, ip->addr, ip->mark); \r
+#endif\r
\r
/* -------------------------------------------------------- mark download */\r
\r
- sprintf(str,"-A %s -d %s/32 -o %s -j %s%d",chain_postrouting,ip->addr,lan,mark_iptables,ip->mark);\r
+ sprintf(str, "-A %s -d %s/32 -o %s -j %s%d",\r
+ chain_postrouting, ip->addr, lan, mark_iptables, ip->mark);\r
/*sprintf(str,"-A %s -d %s/32 -o %s -j MARK --set-mark %d",chain_postrouting,ip->addr,lan,ip->mark);*/\r
/* -m limit --limit 1/s */ \r
save_line(str);\r
\r
if(qos_proxy)\r
{\r
- sprintf(str,"-A %s -s %s -p tcp --sport %d -d %s/32 -o %s -j %s%d",chain_postrouting,proxy_ip,proxy_port,ip->addr,lan,mark_iptables,ip->mark);\r
+ sprintf(str, "-A %s -s %s -p tcp --sport %d -d %s/32 -o %s -j %s%d",\r
+ chain_postrouting, proxy_ip, proxy_port, ip->addr, lan, mark_iptables, ip->mark);\r
/*sprintf(str,"-A %s -s %s -p tcp --sport %d -d %s/32 -o %s -j MARK --set-mark %d",chain_postrouting,proxy_ip,proxy_port,ip->addr,lan,ip->mark);*/\r
save_line(str);\r
}\r
\r
- sprintf(str,"-A %s -d %s/32 -o %s -j ACCEPT",chain_postrouting,ip->addr,lan);\r
+ sprintf(str, "-A %s -d %s/32 -o %s -j ACCEPT",\r
+ chain_postrouting, ip->addr, lan);\r
save_line(str);\r
\r
/* -------------------------------------------------------- mark upload */\r
- sprintf(str,"-A %s -s %s/32 -o %s -j %s%d",chain_forward,ip->addr,wan,mark_iptables,ip->mark);\r
+ sprintf(str, "-A %s -s %s/32 -o %s -j %s%d", \r
+ chain_forward, ip->addr, wan, mark_iptables, ip->mark);\r
/* sprintf(str,"-A %s -s %s/32 -o %s -j MARK --set-mark %d",chain_forward,ip->addr,wan,ip->mark);*/\r
save_line(str);\r
\r
- sprintf(str,"-A %s -s %s/32 -o %s -j ACCEPT",chain_forward,ip->addr,wan);\r
+ sprintf(str, "-A %s -s %s/32 -o %s -j ACCEPT",\r
+ chain_forward, ip->addr, wan);\r
save_line(str);\r
\r
if(ip->min)\r
{\r
/* -------------------------------------------------------- download class */\r
+#ifdef DEBUG\r
printf("(down: %dk-%dk ", ip->min, ip->max); \r
+#endif\r
\r
- sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", tc, lan, ip->group, ip->mark,ip->min,ip->max, burst, ip->prio);\r
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", \r
+ tc, lan, ip->group, ip->mark,ip->min,ip->max, burst, ip->prio);\r
safe_run(str);\r
\r
- if (strcmpi(ip->keyword->leaf_discipline, "none"))\r
+ if(strcmpi(ip->keyword->leaf_discipline, "none"))\r
{\r
- sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, lan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
+ sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s", \r
+ tc, lan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
safe_run(str);\r
- } \r
- if (filter_type == 1)\r
+ }\r
+\r
+ if(filter_type == 1)\r
{\r
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, lan, ip->mark, ip->mark);\r
+ sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",\r
+ tc, lan, ip->mark, ip->mark);\r
safe_run(str);\r
}\r
\r
/* -------------------------------------------------------- upload class */\r
+#ifdef DEBUG\r
printf("up: %dk-%dk)\n", (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), \r
(int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed));\r
+#endif\r
\r
sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
tc, wan, ip->group, ip->mark,\r
(int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio);\r
safe_run(str);\r
\r
- if (strcmpi(ip->keyword->leaf_discipline, "none"))\r
+ if(strcmpi(ip->keyword->leaf_discipline, "none"))\r
{\r
- sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s",tc, wan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
+ sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s",\r
+ tc, wan, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/\r
safe_run(str);\r
} \r
- if (filter_type == 1)\r
+\r
+ if(filter_type == 1)\r
{\r
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",tc, wan, ip->mark, ip->mark);\r
+ sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",\r
+ tc, wan, ip->mark, ip->mark);\r
safe_run(str);\r
}\r
+ \r
+ if(f > 0)\r
+ {\r
+ fprintf(f, "%s %d\n", ip->addr, ip->mark);\r
+ }\r
}\r
else\r
+ {\r
+#ifdef DEBUG\r
printf("(sharing %s)\n", ip->sharing);\r
+#endif\r
+ }\r
i++;\r
}\r
-\r
+ if(f > 0)\r
+ {\r
+ puts("done.");\r
+ fclose(f);\r
+ }\r
+ \r
if(idxs)\r
{\r
chain_forward = "forw_common";\r
/* -------------------------------- classify or reject free download */\r
{\r
char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */\r
- if(free_min) final_chain = "ACCEPT";\r
+ if(free_min)\r
+ {\r
+ final_chain = "ACCEPT";\r
+ }\r
if(qos_proxy)\r
{\r
if(free_min)\r
{\r
- sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s%d",chain_postrouting,proxy_ip,proxy_port,lan,mark_iptables,3);\r
+ sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s%d",\r
+ chain_postrouting,proxy_ip,proxy_port,lan,mark_iptables,3);\r
save_line(str);\r
}\r
- sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s",chain_postrouting,proxy_ip,proxy_port,lan,final_chain);\r
+ sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s",\r
+ chain_postrouting,proxy_ip,proxy_port,lan,final_chain);\r
save_line(str);\r
}\r
if(free_min)\r
{\r
- sprintf(str,"-A %s -o %s -j %s%d",chain_postrouting,lan,mark_iptables,3);\r
+ sprintf(str,"-A %s -o %s -j %s%d", chain_postrouting, lan, mark_iptables, 3);\r
save_line(str);\r
}\r
- sprintf(str,"-A %s -o %s -j %s",chain_postrouting,lan,final_chain);\r
+ sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);\r
save_line(str);\r
/* ------------------------------- classify or reject free upload */\r
if(free_min)\r
{\r
- sprintf(str,"-A %s -o %s -j %s%d",chain_forward,wan,mark_iptables,3);\r
+ sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, 3);\r
save_line(str);\r
}\r
- sprintf(str,"-A %s -o %s -j %s",chain_forward,wan,final_chain);\r
+ sprintf(str,"-A %s -o %s -j %s", chain_forward, wan, final_chain);\r
save_line(str);\r
}\r
\r
puts("Generating free bandwith classes ...");\r
/*-----------------------------------------------------------------*/\r
sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
- tc,lan,parent,free_min,free_max,burst,lowest_priority);\r
+ tc, lan, parent, free_min, free_max,burst, lowest_priority);\r
safe_run(str);\r
sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d",\r
- tc,wan,parent,free_min,free_max,burst,lowest_priority);\r
+ tc, wan, parent, free_min, free_max, burst, lowest_priority);\r
safe_run(str);\r
/* tc SFQ */\r
- if (strcmpi(qos_leaf, "none"))\r
+ if(strcmpi(qos_leaf, "none"))\r
{\r
- sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,lan,qos_leaf);\r
+ sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s", tc, lan, qos_leaf);\r
safe_run(str);\r
\r
- sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s",tc,wan,qos_leaf);\r
+ sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s", tc, wan, qos_leaf);\r
safe_run(str);\r
} \r
/* tc handle 1 fw flowid */\r
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,lan);\r
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3", tc, lan);\r
safe_run(str);\r
\r
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,wan);\r
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3", tc, wan);\r
safe_run(str);\r
}\r
printf("Total IP count: %d\n", i);\r
run_restore(); \r
- if (log_file) fclose(log_file);\r
+ if(log_file)\r
+ {\r
+ fclose(log_file);\r
+ }\r
return 0;\r
/* that's all folks, thank you for reading it all the way up to this point ;-) */\r
/* bad luck C<<1 is not yet finished, I promise no sprintf() next time... */\r
GIT.Harvie.CZ / svn / Prometheus-QoS / .git / blobdiff