- /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\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-2012 Michael Polak, Arachne Labs */\r
-/* iptables-restore support Copyright(C) 2007-2008 ludva */\r
-/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */\r
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
-\r
-/* Modified by: xChaos, 20121011\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-2015 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, 20151020\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 512\r
-#undef DEBUG\r
-\r
#include "cll1-0.6.2.h"\r
#include "ipstruct.h"\r
\r
-const char *version = "0.8.3-g";\r
+const char *version = "0.8.5-d";\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.5 is development release, 0.8.6 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 = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-201
2 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";
\r+const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-201
5 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";
\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
--d Dry run (preview tc and iptables commands on stdout)\n\\r
--r Run (reset all statistics and start shaping - daily usage)\n\\r
--p just generate Preview of data transfer statistics and exit (after -r)\n\\r
--s start Shaping FUP limits (keeps data transfer stat like -p) (after -r)\n\\r
--n run Now (like -r delay - overrides qos-free-delay keyword, after boot)\n\\r
--f just Flush iptables and tc classes and exit (stop shaping, no QiS)\n\\r
--9 emergency iptables flush (like -f, but dumps data transfer statistics)\n\\r
-\n\\r
--c filename force alternative /etc/prometheus/prometheus.conf filename\n\\r
--h filename force alternative /etc/hosts filename (overrides hosts keyword)\n\\r
--l Mmm YYYY generate HTML summary of Logged traffic (Mmm=Jan-Dec) (and exit)\n\\r
--m generate HTML summary of traffic for yesterday's Month (and exit)\n\\r
--y generate HTML summary of traffic for yesterday's Year (and exit)\n\\r
--? --help show this help scree (and exit)\n\\r
--v --version show Version number of this utility (and exit)\n");\r
-}\r
+#define STRLEN 512\r
+#undef DEBUG\r
\r
/* ======= All path names are defined here (for RPM patch) ======= */\r
\r
-const char *tc = "/sbin/tc"; /* requires tc with HTB support */\r
-const char *iptables = "/sbin/iptables"; /* 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 *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 *macrosfile = "/etc/prometheus/prometheus.macros"; /* rewrite rules for most common tariffs */\r
char *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/\r
+char *ip6tablesfile = "/var/spool/prometheus.ip6tables"; /* temporary file for ip6tables-restore*/\r
char *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */\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 = "/var/www/logs/traffic.json"; /* hall of fame - json 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
\r
char *jquery_url = "http://code.jquery.com/jquery-latest.js";\r
char *lms_url = "/lms/?m=customerinfo&id=";\r
-int use_jquery_popups = 1;\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 *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */\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
+char *ip6preamble = "-A FORWARD -p ipv6-icmp -j ACCEPT\n-A POSTROUTING -p ipv6-icmp -j ACCEPT\n-A FORWARD -s fe80::/10 -j ACCEPT\n-A FORWARD -d ff00::/8 -j ACCEPT\n-A POSTROUTING -s fe80::/10 -j ACCEPT\n-A POSTROUTING -d ff00::/8 -j ACCEPT";\r
FILE *iptables_file = NULL;\r
-int enable_credit = 1; /* enable credit file */\r
-int use_credit = 0; /* use credit file (if enabled)*/\r
+FILE *ip6tables_file = NULL;\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 *ip6prefix = NULL; /* Prefix for global /48 IPv6 subnet */\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
-char *proxy_ip = "192.168.1.1/32"; /* our IP with proxy port */\r
-int proxy_port = 3128; /* proxy port number */\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
long long int up = 1024; /* WAN/ISP upload in kbps */\r
-int free_min = 32; /* minimum guaranted bandwidth for all undefined hosts */\r
-int free_max = 64; /* maximum allowed bandwidth for all undefined hosts */\r
+int free_min = 256; /* minimum guaranted bandwidth for all undefined hosts */\r
+int free_max = 512; /* maximum allowed bandwidth for all undefined hosts */\r
+int overlimit_min = 256; /* minimum guaranted bandwidth for all undefined hosts */\r
+int overlimit_max = 512; /* maximum allowed bandwidth for all undefined hosts */\r
int qos_free_delay = 0; /* seconds to sleep before applying new QoS rules */\r
int digital_divide = 2; /* controls digital divide weirdness ratio, 1...3 */ \r
-int max_nesting = 3; /* maximum nesting of HTB clases, built-in maximum seems to be 4 */\r
+int max_nesting = 5; /* /include/uapi/linux/pkt_sched.h: #define TC_HTB_MAXDEPTH 8 [... - 3 parent classes] */\r
int htb_r2q = 256; /* should work for leaf values 512 kbps to 8 Mbps */\r
int burst = 8; /* HTB burst (in kbits) */\r
int burst_main = 64;\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
-*/\r
+int class_count = 0;\r
+int ip_count = 0;\r
FILE *log_file = NULL;\r
char *kwd = "via-prometheus"; /* /etc/hosts comment, eg. #qos-64-128 */\r
\r
const int highest_priority = 0; /* highest HTB priority (HTB built-in value is 0) */\r
-const int lowest_priority = 7; /* lowest HTB priority (HTB built-in value is 7) */\r
+const int lowest_priority = 7; /* lowest HTB priority /include/uapi/linux/pkt_sched.h: #define TC_HTB_NUMPRIO 8 */\r
const int idxtable_treshold1 = 24; /* this is no longer configurable */\r
const int idxtable_treshold2 = 12; /* this is no longer configurable */\r
const int idxtable_bitmask1 = 3; /* this is no longer configurable */\r
const int idxtable_bitmask2 = 3; /* this is no longer configurable */\r
\r
-struct IP *ips = NULL, *ip, *sharedip;\r
+struct IP *ips = NULL, *networks = NULL, *ip, *sharedip;\r
struct Group *groups = NULL, *group;\r
-struct Keyword *keyword, *defaultkeyword=NULL, *keywords=NULL;\r
+struct Keyword *keyword, *defaultkeyword=NULL, *keywords = NULL;\r
+struct Macro *macro, *macros = NULL;\r
+\r
+#define FREE_CLASS 3\r
+#define OVERLIMIT_CLASS 4\r
+\r
+void help(void);\r
+/* implemented in help.c */
+\r
+void get_traffic_statistics(const char *whichiptables, int ipv6);\r
+/* implemented in parseiptables.c */\r
\r
void parse_ip_log(int argc, char **argv);\r
-/* implementid in parselog.c */\r
+/* implemented in parselog.c */\r
\r
void parse_hosts(char *hosts);\r
-/* implementid in parsehosts.c */\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
+void analyse_topology(char *traceroute);\r
+/* implemented in networks.c */\r
+\r
+char *parse_datafile_line(char *str);\r
+/* implemented in utils.c */\r
+\r
+time_t get_mtime(const char *path);\r
+/* implemented in utils.c */\r
\r
const char *tr_odd_even(void)\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
struct Index *parent;\r
int bitmask;\r
int children;\r
+ int ipv6;\r
list(Index);\r
} *idxs=NULL, *idx, *metaindex;\r
\r
-void TheIP(void);\r
-/* function implemented in parsehosts.c */\r
\r
/* ====== iptables indexes are used to reduce complexity to log8(N) ===== */\r
\r
char *subnet_id(char *ip, int bitmask);\r
/* function implemented in ipv4subnets.c */\r
\r
+char *index6_id(char *ip, int bitmask);\r
+/* function implemented in ipv6subnets.c */\r
+\r
+char *subnet6_id(char *ip, int bitmask);\r
+/* function implemented in ipv6subnets.c */\r
+\r
/* ================= Let's parse configuration file here ================ */\r
\r
void reject_config_and_exit(char *filename)\r
printf("%s ",kwd);\r
\r
create(keyword,Keyword);\r
- keyword->key=kwd;\r
- keyword->asymetry_ratio=1; /* ratio for ADSL-like upload */\r
- keyword->asymetry_fixed=0; /* fixed treshold for ADSL-like upload */\r
- keyword->data_limit=8; /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */\r
- keyword->data_prio=4; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */\r
- keyword->fixed_limit=0; /* fixed data limit for setting lower HTB ceil */\r
- keyword->fixed_prio=0; /* fixed data limit for setting lower HTB prio */\r
- keyword->reserve_min=8; /* bonus for nominal HTB rate bandwidth (in kbps) */\r
- keyword->reserve_max=0; /* malus for nominal HTB ceil (in kbps) */\r
- keyword->default_prio=highest_priority+1;\r
- keyword->html_color="000000";\r
- keyword->ip_count=0;\r
- keyword->leaf_discipline="";\r
-\r
- push(keyword,keywords);\r
- if(!defaultkeyword) defaultkeyword=keyword;\r
+ keyword->key = kwd;\r
+ keyword->asymetry_ratio = 1; /* ratio for ADSL-like upload */\r
+ keyword->asymetry_fixed = 0; /* fixed treshold for ADSL-like upload */\r
+ keyword->data_limit = 8; /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */\r
+ keyword->data_prio = 4; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */\r
+ keyword->fixed_limit = 0; /* fixed data limit for setting lower HTB ceil */\r
+ keyword->fixed_prio = 0; /* fixed data limit for setting lower HTB prio */\r
+ keyword->reserve_min = 8; /* bonus for nominal HTB rate bandwidth (in kbps) */\r
+ keyword->reserve_max = 0; /* malus for nominal HTB ceil (in kbps) */\r
+ keyword->default_prio = highest_priority+1;\r
+ keyword->download_aggregation = keyword->upload_aggregation = 0; /* disable by default */\r
+ keyword->html_color = "000000";\r
+ keyword->ip_count = 0;\r
+ keyword->leaf_discipline = "";\r
+ keyword->allowed_avgmtu = 0;\r
+\r
+ push(keyword, keywords);\r
+ if(!defaultkeyword)\r
+ {\r
+ defaultkeyword = keyword;\r
+ }\r
keywordcount++;\r
\r
kwd=NULL;\r
{\r
char *tmptr=_; /* <---- l+1 ----> */\r
_+=l+1; /* via-prometheus-asymetry-ratio, etc. */\r
- ioption("asymetry-ratio",keyword->asymetry_ratio);\r
- ioption("asymetry-treshold",keyword->asymetry_fixed);\r
- ioption("magic-relative-limit",keyword->data_limit);\r
- ioption("magic-relative-prio",keyword->data_prio);\r
- loption("magic-fixed-limit",keyword->fixed_limit);\r
- loption("magic-fixed-prio",keyword->fixed_prio);\r
- ioption("htb-default-prio",keyword->default_prio);\r
- ioption("htb-rate-bonus",keyword->reserve_min);\r
- ioption("htb-ceil-malus",keyword->reserve_max);\r
- option("leaf-discipline",keyword->leaf_discipline);\r
- option("html-color",keyword->html_color);\r
+ foption("asymetry-ratio", keyword->asymetry_ratio);\r
+ ioption("asymetry-treshold", keyword->asymetry_fixed);\r
+ ioption("magic-relative-limit", keyword->data_limit);\r
+ ioption("magic-relative-prio", keyword->data_prio);\r
+ loption("magic-fixed-limit", keyword->fixed_limit);\r
+ loption("magic-fixed-prio", keyword->fixed_prio);\r
+ ioption("htb-default-prio", keyword->default_prio);\r
+ ioption("htb-rate-bonus", keyword->reserve_min);\r
+ ioption("htb-ceil-malus", keyword->reserve_max);\r
+ ioption("download-aggregation", keyword->download_aggregation);\r
+ ioption("upload-aggregation", keyword->upload_aggregation);\r
+ option("leaf-discipline", keyword->leaf_discipline);\r
+ option("html-color", keyword->html_color);\r
+ ioption("allowed-avgmtu" ,keyword->allowed_avgmtu);\r
_=tmptr;\r
\r
if(keyword->data_limit || keyword->fixed_limit || \r
\r
option("tc",tc);\r
option("iptables",iptables);\r
- option("iptables-save",iptablessave); /* new */\r
- option("iptables-restore",iptablesrestore); /* new */\r
- option("iptables-in-filename",iptablesfile); /* new */\r
+ option("iptables-save",iptablessave);\r
+ option("iptables-restore",iptablesrestore);\r
+ option("ip6tables",ip6tables);\r
+ option("ip6tables-save",ip6tablessave);\r
+ option("ip6tables-restore",ip6tablesrestore);\r
+ option("iptables-in-filename",iptablesfile);\r
+ option("ip6tables-in-filename",ip6tablesfile);\r
option("hosts",hosts);\r
option("lan-interface",lan);\r
option("wan-interface",wan);\r
+ option("ip6-prefix",ip6prefix);\r
option("lan-medium",lan_medium);\r
option("wan-medium",wan_medium);\r
lloption("wan-download",line);\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);\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
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
- option("qos-proxy-ip",proxy_ip);\r
+/* ioption("qos-proxy-enable",qos_proxy); */\r
+/* option("qos-proxy-ip",proxy_ip);*/\r
option("htb-leaf-discipline",qos_leaf);\r
- ioption("qos-proxy-port",proxy_port);\r
+/* ioption("qos-proxy-port",proxy_port); */\r
ioption("free-rate",free_min);\r
ioption("free-ceil",free_max);\r
+ ioption("overlimit-rate",overlimit_min);\r
+ ioption("overlimit-ceil",overlimit_max);\r
ioption("htb-burst",burst);\r
ioption("htb-burst-main",burst_main);\r
ioption("htb-burst-group",burst_group);\r
/* leaf discipline for keywords */\r
for_each(keyword,keywords)\r
{\r
- if(!strcmpi(keyword->leaf_discipline, ""))\r
- {\r
- keyword->leaf_discipline = qos_leaf;\r
- }\r
+ if(!strcmpi(keyword->leaf_discipline, ""))\r
+ {\r
+ keyword->leaf_discipline = qos_leaf;\r
+ }\r
}\r
\r
if(strcmpi(cnf, "mark"))\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
- {\r
- setchainname=1;\r
- }\r
- else if(eq(ptr,"pkts")) \r
- {\r
- valid=0;\r
- }\r
- else\r
- {\r
- sscanf(ptr,"%lu",&pkts); \r
- }\r
- break;\r
- case 2: if(setchainname)\r
- {\r
- if(!strncmp(ptr,"post_",5) || eq(ptr,"POSTROUTING"))\r
- {\r
- downloadflag = 1; \r
- }\r
- else \r
- {\r
- if(!strncmp(ptr,"forw_",5) || eq(ptr,"FORWARD"))\r
- {\r
- downloadflag = 0;\r
- }\r
- } \r
- if(eq(ptr,"post_common") || eq(ptr,"forw_common"))\r
- {\r
- commonflag = 1;\r
- }\r
- }\r
- else\r
- {\r
- sscanf(ptr,"%Lu",&traffic); \r
- traffic += (1<<19);\r
- traffic >>= 20;\r
- }\r
- break;\r
- case 3: if((strncmp(ptr,"post_",5) && strncmp(ptr,"forw_",5)) || commonflag)\r
- {\r
- accept=eq(ptr,mark);\r
- }\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))\r
- {\r
- proxyflag=1; \r
- }\r
- }\r
- else\r
- {\r
- ipaddr=ptr; \r
- }\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 MB (%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
- free(cmd);\r
-}\r
\r
/* ========== This function executes, logs OR ALSO prints command ========== */\r
\r
}\r
}\r
\r
-void save_line(char *line)\r
+void iptables_save_line(char *line, int ipv6)\r
{\r
- fprintf(iptables_file,"%s\n",line);\r
+ if(ipv6)\r
+ {\r
+ fprintf(ip6tables_file,"%s\n",line);\r
+ }\r
+ else\r
+ {\r
+ fprintf(iptables_file,"%s\n",line);\r
+ }\r
}\r
\r
-void run_restore(void)\r
+void run_iptables_restore(void)\r
{\r
char *restor;\r
string(restor,STRLEN);\r
/*-----------------------------------------------------------------*/\r
printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);\r
/*-----------------------------------------------------------------*/\r
- \r
- save_line("COMMIT");\r
+\r
+ iptables_save_line("COMMIT", FALSE);\r
fclose(iptables_file);\r
if(dry_run) \r
{\r
\r
sprintf(restor,"%s <%s",iptablesrestore, iptablesfile);\r
safe_run(restor);\r
- \r
- free(restor);\r
-}\r
-\r
-char *parse_datafile_line(char *str)\r
-{\r
- char *ptr=strchr(str,' ');\r
\r
- if(ptr)\r
- {\r
- *ptr=0;\r
- ptr++;\r
- return ptr;\r
- } \r
- else \r
+ if(ip6prefix)\r
{\r
- return NULL;\r
+ /*-----------------------------------------------------------------*/\r
+ printf("Running %s <%s ...\n", ip6tablesrestore, ip6tablesfile);\r
+ /*-----------------------------------------------------------------*/\r
+ iptables_save_line("COMMIT", TRUE);\r
+ fclose(ip6tables_file);\r
+ if(dry_run) \r
+ {\r
+ parse(ip6tablesfile)\r
+ {\r
+ printf("%s\n",_);\r
+ }\r
+ done; /* ugly macro end */\r
+ }\r
+ sprintf(restor,"%s <%s",ip6tablesrestore, ip6tablesfile);\r
+ safe_run(restor);\r
}\r
+ free(restor);\r
}\r
\r
-void append_log(struct IP *self) /*using global variables*/\r
-{\r
- char *d, *str;\r
- FILE *f; \r
+/**/\r
\r
- date(d); /* this is typical cll1.h macro - prints current date */ \r
- string(str,STRLEN); \r
- sprintf(str,"%s/%s.log", log_dir, self->name);\r
- f=fopen(str,"a");\r
- if(f > 0)\r
- {\r
- fprintf(f,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s",\r
- time(NULL), self->name, self->traffic, self->direct, self->proxy,\r
- self->upload, self->min, self->max, self->desired, self->lmsid, d); /* d = date*/\r
- fclose(f);\r
- }\r
- else\r
- {\r
- perror(str);\r
- }\r
-}\r
+char *parse_datafile_line(char *str);\r
+time_t get_mtime(const char *path);\r
\r
/*-----------------------------------------------------------------*/\r
/* Are you looking for int main(int argc, char **argv) ? :-)) */\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
-\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
+ char *substring, *limit_pkts;\r
+\r
+ int parent = 1;\r
+ int just_networks = FALSE; \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 stop_shaping = FALSE; /* lift FUP - requires classmap file */\r
+ int reduce_ceil = 0; /* allow only rate+(ceil-rate)/2, /4, etc. */\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-2012 Michael Polak, Arachne Labs\n\\r
+Version %s - Copyright (C)2005-2015 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
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("-q") { run=TRUE; just_preview=TRUE; stop_shaping=TRUE; }\r
+ argument("-2") { run=TRUE; just_preview=TRUE; reduce_ceil=2; }\r
+ argument("-4") { run=TRUE; just_preview=TRUE; reduce_ceil=4; }\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("-a") { run=TRUE; just_networks=TRUE; }\r
argument("-l") { just_logs=TRUE; }\r
argument("-m") { just_logs=TRUE; }\r
argument("-y") { just_logs=TRUE; }\r
\r
if(althosts)\r
{\r
- hosts=althosts;\r
+ hosts = althosts;\r
}\r
\r
if(just_flush<9)\r
/*-----------------------------------------------------------------*/\r
puts("Parsing iptables verbose output ...");\r
/*-----------------------------------------------------------------*/\r
- get_traffic_statistics();\r
+ get_traffic_statistics(iptables, FALSE);\r
+ if(ip6prefix)\r
+ {\r
+ /*-----------------------------------------------------------------*/\r
+ puts("Parsing ip6tables verbose output ...");\r
+ /*-----------------------------------------------------------------*/ \r
+ get_traffic_statistics(ip6tables, TRUE);\r
+ }\r
}\r
\r
/*-----------------------------------------------------------------*/\r
- printf("Parsing class defintion file %s ...\n", hosts);\r
+ /* cll1.h - let's allocate brand new character buffer... */\r
/*-----------------------------------------------------------------*/\r
- parse_hosts(hosts);\r
+ string(str, STRLEN); \r
+ string(limit_pkts, STRLEN);\r
\r
/*-----------------------------------------------------------------*/\r
- /* cll1.h - let's allocate brand new character buffer... */\r
+ printf("Parsing macro definition file %s ...\n", macrosfile);\r
+ /*-----------------------------------------------------------------*/\r
+ parse(macrosfile)\r
+ {\r
+ ptr = parse_datafile_line(_);\r
+ if(ptr)\r
+ {\r
+ create(macro, Macro);\r
+ macro->rewrite_from = _;\r
+ macro->rewrite_to = ptr;\r
+ push(macro, macros);\r
+ printf("%s -> %s\n", macro->rewrite_from, macro->rewrite_to);\r
+ }\r
+ }\r
+ done; /* ugly macro end */\r
+\r
/*-----------------------------------------------------------------*/\r
- string(str,STRLEN); \r
+ printf("Parsing class defintion file %s ...\n", hosts);\r
+ /*-----------------------------------------------------------------*/\r
+ parse_hosts(hosts);\r
+ if(just_networks)\r
+ {\r
+ analyse_topology("/usr/sbin/traceroute -n -m 10 -w 2 %s.%d");\r
+ exit(-1); \r
+ }\r
\r
/*-----------------------------------------------------------------*/\r
puts("Resolving shared connections ...");\r
/*-----------------------------------------------------------------*/\r
- for_each(ip,ips) if(ip->sharing)\r
+ for_each(ip, ips) if(ip->sharing)\r
{\r
- for_each(sharedip,ips) if(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->mark=sharedip->mark; \r
- ip->lmsid=sharedip->lmsid;\r
+ sharedip->traffic += ip->traffic;\r
+ sharedip->traffic_down += ip->direct;\r
+ sharedip->traffic_up += ip->upload;\r
+ ip->traffic = 0;\r
+ ip->mark = sharedip->mark; \r
+ ip->lmsid = sharedip->lmsid;\r
+ ip->pps_limit = sharedip->pps_limit; /* no other way to do this */\r
+\r
+ /* Ugly hack: append IPv4 addresses of sharedip to IPv6 uplinks */\r
+ ptr = strchr(ip->addr, '+');\r
+ if(ptr && ptr-ip->addr > 1 && !sharedip->v6)\r
+ {\r
+ *(--ptr) = 0;\r
+ concatenate(ip->addr, sharedip->addr, ptr);\r
+ ip->name = ip->addr = ptr;\r
+ ptr = strchr(ip->addr, '.');\r
+ while(ptr && *ptr)\r
+ {\r
+ *ptr = ':';\r
+ ptr = strchr(ptr, '.');\r
+ }\r
+ ip->mask += 64;\r
+ }\r
+\r
break;\r
}\r
if(not sharedip)\r
/*-----------------------------------------------------------------*/\r
parse(credit)\r
{\r
- ptr=parse_datafile_line(_);\r
+ ptr = parse_datafile_line(_);\r
if(ptr)\r
{\r
if_exists(ip,ips,eq(ip->addr,_))\r
done; /* ugly macro end */\r
}\r
\r
+\r
if(!just_preview)\r
{\r
/*-----------------------------------------------------------------*/\r
puts("Initializing iptables and tc classes ...");\r
/*-----------------------------------------------------------------*/\r
\r
- iptables_file=fopen(iptablesfile,"w");\r
+ iptables_file = fopen(iptablesfile, "w");\r
if(iptables_file == NULL)\r
{\r
- puts("Cannot open iptablesfile!");\r
+ perror(iptablesfile);\r
exit(-1);\r
}\r
+ iptables_save_line(iptablespreamble, FALSE);\r
+\r
+ if(ip6prefix)\r
+ {\r
+ ip6tables_file = fopen(ip6tablesfile, "w");\r
+ if(ip6tables_file == NULL)\r
+ {\r
+ perror(ip6tablesfile);\r
+ exit(-1);\r
+ }\r
+ iptables_save_line(iptablespreamble, TRUE);\r
+ iptables_save_line(ip6preamble, TRUE);\r
+ }\r
+\r
+ run_iptables_restore();\r
\r
- log_file=fopen(cmdlog,"w");\r
+ log_file = fopen(cmdlog, "w");\r
if(log_file == NULL) \r
{\r
- puts("Cannot open logfile!");\r
+ perror(cmdlog);\r
exit(-1);\r
- }\r
- \r
- save_line(iptablespreamble);\r
- run_restore();\r
+ } \r
\r
sprintf(str,"%s qdisc del dev %s root 2>/dev/null",tc,lan);\r
safe_run(str);\r
safe_run(str);\r
\r
iptables_file=fopen(iptablesfile,"w");\r
- save_line(iptablespreamble);\r
+ iptables_save_line(iptablespreamble, FALSE);\r
+ if(ip6prefix)\r
+ {\r
+ ip6tables_file=fopen(ip6tablesfile,"w");\r
+ iptables_save_line(iptablespreamble, TRUE);\r
+ iptables_save_line(ip6preamble, TRUE);\r
+ }\r
\r
- if(qos_free_zone && *qos_free_zone!='0')\r
+ if(qos_free_zone && *qos_free_zone!='0') /* this is currently supported only for IPv4 */\r
{\r
char *chain;\r
\r
sprintf(str,"-A FORWARD -d %s -o %s -j ACCEPT", qos_free_zone, wan);\r
- save_line(str);\r
+ iptables_save_line(str, FALSE); /* this is currently supported only for IPv4 */\r
\r
+/*\r
if(qos_proxy)\r
{\r
- save_line(":post_noproxy - [0:0]");\r
+ iptables_save_line(":post_noproxy - [0:0]", FALSE);\r
sprintf(str,"-A POSTROUTING ! -p tcp -o %s -j post_noproxy", lan);\r
- save_line(str); \r
+ iptables_save_line(str , FALSE);\r
sprintf(str,"-A POSTROUTING ! -s %s -o %s -j post_noproxy", proxy_ip, lan);\r
- save_line(str); \r
+ iptables_save_line(str, FALSE);\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
+ iptables_save_line(str, FALSE);\r
\r
chain="post_noproxy"; \r
}\r
+\r
else\r
{\r
- chain="POSTROUTING";\r
- }\r
+*/\r
+ chain = "POSTROUTING";\r
+// }\r
\r
sprintf(str,"-A %s -s %s -o %s -j ACCEPT", chain, qos_free_zone, lan);\r
- save_line(str);\r
+ iptables_save_line(str, FALSE);\r
}\r
\r
- if(ip_count>idxtable_treshold1 && !just_flush)\r
+ if(ip_count > idxtable_treshold1 && !just_flush)\r
{\r
- int idxcount=0, bitmask=32-idxtable_bitmask1; /* default net mask: 255.255.255.240 */\r
+ int idxcount=0, bitmask=32-idxtable_bitmask1;\r
char *subnet, *buf;\r
/*-----------------------------------------------------------------*/\r
printf("Detected %d addresses - indexing iptables rules to improve performance...\n",ip_count);\r
/*-----------------------------------------------------------------*/\r
\r
- save_line(":post_common - [0:0]");\r
- save_line(":forw_common - [0:0]");\r
+ iptables_save_line(":post_common - [0:0]", FALSE);\r
+ iptables_save_line(":forw_common - [0:0]", FALSE);\r
+ if(ip6prefix)\r
+ {\r
+ iptables_save_line(":post_common - [0:0]", TRUE);\r
+ iptables_save_line(":forw_common - [0:0]", TRUE);\r
+ }\r
\r
- for_each(ip,ips) if(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=index_id(ip->addr,bitmask);\r
+ if(ip->v6)\r
+ {\r
+ buf=index6_id(ip->addr,bitmask+32);\r
+ }\r
+ else\r
+ {\r
+ buf=index_id(ip->addr, bitmask);\r
+ }\r
+ \r
if_exists(idx,idxs,eq(idx->id,buf))\r
{\r
idx->children++;\r
else\r
{\r
create(idx,Index);\r
- idx->addr=ip->addr;\r
- idx->id=buf;\r
- idx->bitmask=bitmask;\r
- idx->parent=NULL;\r
- idx->children=0;\r
+ idx->addr = ip->addr;\r
+ idx->id = buf;\r
+ idx->bitmask = bitmask+32*ip->v6;\r
+ idx->parent = NULL;\r
+ idx->children = 0;\r
+ idx->ipv6 = ip->v6;\r
idxcount++;\r
push(idx,idxs);\r
}\r
}\r
\r
/* brutal perfomance optimalization */\r
- while(idxcount>idxtable_treshold2 && bitmask>2*idxtable_bitmask2)\r
+ while(idxcount > idxtable_treshold2 && bitmask > 2*idxtable_bitmask2)\r
{\r
- bitmask-=idxtable_bitmask2;\r
- idxcount=0;\r
+ bitmask -= idxtable_bitmask2;\r
+ idxcount = 0;\r
\r
for_each(idx,idxs) if(idx->parent == NULL)\r
{\r
- buf=index_id(idx->addr,bitmask);\r
+ if(idx->ipv6)\r
+ {\r
+ buf = index6_id(idx->addr, bitmask+32);\r
+ }\r
+ else\r
+ {\r
+ buf = index_id(idx->addr, bitmask);\r
+ }\r
if_exists(metaindex,idxs,eq(metaindex->id,buf))\r
{\r
metaindex->children++;\r
else\r
{\r
create(metaindex,Index);\r
- metaindex->addr=idx->addr;\r
- metaindex->id=buf;\r
- metaindex->bitmask=bitmask;\r
- metaindex->parent=NULL;\r
- metaindex->children=0;\r
+ metaindex->addr = idx->addr;\r
+ metaindex->id = buf;\r
+ metaindex->bitmask = bitmask+32*idx->ipv6;\r
+ metaindex->parent = NULL;\r
+ metaindex->children = 0;\r
+ metaindex->ipv6 = idx->ipv6;\r
idxcount++;\r
push(metaindex,idxs);\r
}\r
}\r
}\r
\r
- /* this should slightly optimize throughout ... */\r
+ /* this should slightly optimize throughput ... */\r
sort(idx,idxs,desc_order_by,children);\r
sort(idx,idxs,order_by,bitmask);\r
\r
i=0;\r
for_each(idx,idxs)\r
{\r
- subnet=subnet_id(idx->addr,idx->bitmask);\r
- printf("%d: %s/%d\n",\r
- ++i, subnet, idx->bitmask);\r
+ if(idx->ipv6)\r
+ {\r
+ subnet=subnet6_id(idx->addr, idx->bitmask);\r
+ }\r
+ else\r
+ {\r
+ subnet=subnet_id(idx->addr, idx->bitmask);\r
+ }\r
+ printf("%d: %s/%d\n", ++i, subnet, idx->bitmask);\r
\r
sprintf(str,":post_%s - [0:0]", idx->id);\r
- save_line(str);\r
+ iptables_save_line(str, idx->ipv6);\r
\r
sprintf(str,":forw_%s - [0:0]", idx->id);\r
- save_line(str);\r
+ iptables_save_line(str, idx->ipv6);\r
\r
if(idx->parent)\r
{\r
string(buf,strlen(idx->parent->id)+6);\r
- sprintf(buf,"post_%s",idx->parent->id);\r
+ sprintf(buf,"post_%s", idx->parent->id);\r
}\r
else\r
{\r
}\r
\r
sprintf(str,"-A %s -d %s/%d -o %s -j post_%s", buf, subnet, idx->bitmask, lan, idx->id);\r
- save_line(str);\r
+ iptables_save_line(str, idx->ipv6);\r
\r
sprintf(str,"-A %s -d %s/%d -o %s -j post_common", buf, subnet, idx->bitmask, lan);\r
- save_line(str);\r
+ iptables_save_line(str, idx->ipv6);\r
\r
if(idx->parent)\r
{\r
}\r
\r
sprintf(str,"-A %s -s %s/%d -o %s -j forw_%s", buf, subnet, idx->bitmask, wan, idx->id);\r
- save_line(str);\r
+ iptables_save_line(str, idx->ipv6);\r
\r
sprintf(str,"-A %s -s %s/%d -o %s -j forw_common", buf, subnet, idx->bitmask, wan);\r
- save_line(str);\r
+ iptables_save_line(str, idx->ipv6);\r
}\r
printf("Total indexed iptables chains created: %d\n", i);\r
\r
sprintf(str,"-A FORWARD -o %s -j forw_common", wan);\r
- save_line(str);\r
+ iptables_save_line(str, FALSE);\r
\r
sprintf(str,"-A POSTROUTING -o %s -j post_common", lan);\r
- save_line(str);\r
+ iptables_save_line(str, FALSE);\r
+\r
+ if(ip6prefix)\r
+ {\r
+ sprintf(str,"-A FORWARD -o %s -j forw_common", wan);\r
+ iptables_save_line(str, TRUE);\r
+ \r
+ sprintf(str,"-A POSTROUTING -o %s -j post_common", lan);\r
+ iptables_save_line(str, TRUE);\r
+ }\r
}\r
- \r
}\r
\r
if(just_flush)\r
\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
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
+ && ( ip->traffic > ip->credit + (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
\r
if(just_preview)\r
{\r
- if(start_shaping)\r
+ if(start_shaping || stop_shaping || reduce_ceil)\r
{\r
- printf("Reading %s and applying Fair Use Policy rules ... \n", classmap);\r
+ time_t how_much_seconds = time(NULL) - get_mtime(classmap); /* sice start of daily aggregation session */\r
+ printf("Reading %s (%ld seconds old) and applying Fair Use Policy and Aggregation rules... \n", classmap, how_much_seconds);\r
+ \r
parse(classmap)\r
{\r
ptr=strchr(_,' ');\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
+ int unshape_this_ip = 0;\r
+ long avg_mbps_down = ip->traffic_down * 8 / how_much_seconds; \r
+ long avg_mbps_up = ip->traffic_up * 8 / how_much_seconds;\r
+ int agreg = 1, print_stats = 1;\r
+ \r
+ if(ip->keyword->download_aggregation)\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
+ int min_mbps = (ip->min/ip->keyword->download_aggregation)>>10;\r
+ if(min_mbps < 1)\r
+ {\r
+ min_mbps = 1;\r
+ }\r
+ \r
+ if(min_mbps <= avg_mbps_down)\r
+ {\r
+ unshape_this_ip = 0;\r
+ agreg = (int)((float)(avg_mbps_down+1)/min_mbps+.5);\r
+ ip->max /= agreg;\r
+ ip->pps_limit /= agreg;\r
+ printf("Download aggregation 1:%d for %s (min: %lu Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_down);\r
+ }\r
+ else\r
+ {\r
+ unshape_this_ip = 1;\r
+ }\r
+ }\r
+ else if(ip->keyword->upload_aggregation)\r
+ {\r
+ int min_mbps = (ip->min/ip->keyword->upload_aggregation)>>10;\r
+ if(min_mbps < 1)\r
+ {\r
+ min_mbps = 1;\r
+ }\r
+\r
+ if(min_mbps <= avg_mbps_up)\r
+ {\r
+ unshape_this_ip = 0;\r
+ agreg = (int)((float)(avg_mbps_up+1)/min_mbps+.5);\r
+ ip->max /= agreg;\r
+ printf("Upload aggregation 1:%d for %s: (min: %lu Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_up);\r
+ }\r
+ else\r
+ {\r
+ unshape_this_ip = 1;\r
+ }\r
+ }\r
+ if(stop_shaping)\r
+ {\r
+ unshape_this_ip = 1;\r
+ }\r
+ ip->aggregated = agreg; \r
+ ip->mark = atoi(ptr);\r
+ if(ip->max < ip->desired || unshape_this_ip || reduce_ceil) /* apply or disable FUP limit immediately.... */\r
+ {\r
+ if(unshape_this_ip)\r
+ {\r
+ ip->max = ip->desired;\r
+ if(stop_shaping) /* all limits removed, but not printed with -s (start_shaping) switch */\r
+ {\r
+ printf("Removing limit for %s (%s) ", ip->name, ip->addr);\r
+ }\r
+ else\r
+ {\r
+ print_stats = 0;\r
+ }\r
+ }\r
+ else\r
+ {\r
+ printf("Applying limit for %s (%s) ", ip->name, ip->addr);\r
+ if(reduce_ceil)\r
+ {\r
+ ip->max = ip->min + (ip->desired-ip->min)/reduce_ceil;\r
+ }\r
+ else if(ip->max < ip->min)\r
+ {\r
+ ip->max = ip->min;\r
+ } \r
+ }\r
+ if(print_stats)\r
+ {\r
+ printf("(down: %dk-%dk wants %dk, ", ip->min, ip->max, ip->desired);\r
+ }\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
+ if(print_stats)\r
+ {\r
+ printf("up: %dk-%dk wants %dk)\n", (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), \r
+ (int)((ip->desired/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),\r
+ (int)((ip->desired/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed));\r
+ }\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
perror(classmap);\r
puts("Warning - classmap file not fund, just generating preview ...");\r
start_shaping=FALSE;\r
+ stop_shaping=FALSE;\r
}\r
done; /* ugly macro end */\r
}\r
html=preview;\r
- json=json_preview;\r
+ json_traffic=json_preview;\r
}\r
\r
if(!dry_run && !just_flush)\r
{\r
/*-----------------------------------------------------------------*/\r
- printf("Writing json overview %s ... ", json);\r
+ printf("Writing json traffic overview %s ... ", json_traffic);\r
/*-----------------------------------------------------------------*/\r
- f=fopen(json, "w");\r
- if(f > 0)\r
- {\r
- int jsoncount=0;\r
- fprintf(f, "{\n");\r
- for_each(ip, ips)\r
- {\r
- if( ip->lmsid > 0 \r
- && (ip->traffic || ip->direct || ip->proxy || ip->upload))\r
- {\r
- if(jsoncount)\r
- {\r
- fprintf(f, ",\n");\r
- }\r
- fprintf(f, " \"%s\":{ \"lms\": %d, \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu, \"min\":%d, \"max\":%d, \"limit\":%d }",\r
- ip->name, ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload, ip->min, ip->desired, ip->max);\r
- jsoncount++;\r
- }\r
- }\r
- fprintf(f, "}\n");\r
- fclose(f);\r
- puts("done.");\r
- }\r
- else\r
- {\r
- perror(json);\r
- }\r
- }\r
-\r
- f=fopen(html,"w");\r
- if(f > 0)\r
- {\r
- int count=1;\r
- i=0;\r
+ write_json_traffic(json_traffic);\r
\r
/*-----------------------------------------------------------------*/\r
- printf("Sorting data and generating statistics page %s ...\n", html);\r
+ printf("Writing statistics into HTML page %s ...\n", html);\r
/*-----------------------------------------------------------------*/\r
-\r
- if(use_jquery_popups)\r
- {\r
- fprintf(f,"<script type=\"text/javascript\" src=\"%s\"></script>\n", jquery_url);\r
- }\r
- fputs("<table class=\"decorated last\">\n\\r
-<caption>Bandwidth classes</caption>\n\\r
-<thead><tr>\n\\r
-<th style=\"text-align: right\">#</th>\n\\r
-<th style=\"text-align: right\">group</th>\n\\r
-<th style=\"text-align: right\">IPs</th>\n\\r
-<th style=\"text-align: right\">requested</th>\n",f);\r
- fprintf(f,"<th colspan=\"%d\">data limits</th>\n", keywordcount);\r
- fputs("</tr></thead><tbody>\n",f);\r
-\r
- row_odd_even = 0;\r
- for_each(group, groups) \r
- { \r
-#ifdef DEBUG\r
- printf("%d kb/s group: %d bandwidth requested: %d kb/s\n",group->min,group->count,group->desired);\r
-#endif\r
- fprintf(f, "%s<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d kb/s</td>",\r
- tr_odd_even(), count, group->min);\r
- fprintf(f, "<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d kb/s</td>",\r
- group->count, group->desired);\r
-\r
- for_each(keyword, keywords) if(keyword->ip_count)\r
- {\r
- fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%d MB</span></td>",\r
- 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 kb/s\nAGGREGATION: 1/%d\n",\r
- count, i, i/line);\r
-#endif\r
- fprintf(f,"</tr></tbody>\n\\r
-<thead><tr>\n\\r
-<th colspan=\"2\" style=\"text-align: left\">Line %Ld kb/s</td>",line);\r
- fprintf(f,"<th style=\"text-align: right\">%d</td><th style=\"text-align: right\">%d kb/s</td>",total,i);\r
-\r
- for_each(keyword, keywords) if(keyword->ip_count)\r
- {\r
- fprintf(f,"<th style=\"text-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("</thead></table>\n",f);\r
- }\r
- else if(!dry_run && !just_flush)\r
- {\r
- perror(html);\r
+ write_htmlandlogs(html, d, total, just_preview);\r
}\r
\r
- i=0;\r
- if(f > 0)\r
+ if(just_preview)\r
{\r
- unsigned long long total_traffic=0, total_direct=0, total_proxy=0, total_upload=0, tmp_sum=0;\r
- int active_classes=0;\r
- int colspan=12;\r
- struct Sum {unsigned long long l; int i; list(Sum);} *sum,*sums=NULL;\r
- int limit_count=0, prio_count=0;\r
- int popup_button=0;\r
-\r
- if(qos_proxy)\r
- {\r
- colspan++;\r
- }\r
- \r
- fprintf(f,"<p><table class=\"decorated last\">\n<caption>%s",title);\r
- fprintf(f," (%s)</caption>\n", d);\r
- fputs("<thead><tr>\n<th colspan=\"3\"> </th>\n",f);\r
- fputs("<th style=\"text-align: right\">credit</th>\n\\r
-<th style=\"text-align: right\">FUP</th>\n\\r
-<th style=\"text-align: right\">total</th>\n\\r
-<th style=\"text-align: right\">down</th>\n",f);\r
- if(qos_proxy)\r
- {\r
- fputs("<th style=\"text-align: right\">proxy</th>\n",f);\r
- }\r
- fputs("<th style=\"text-align: right\">up</th>\n\\r
-<th style=\"text-align: right\">min</th>\n\\r
-<th style=\"text-align: right\">max</th>\n\\r
-<th style=\"text-align: right\">limit</th>\n\\r
-<th> </th>\n\\r
-</tr><tr>\n\\r
-<th style=\"text-align: right\">#</th>\n\\r
-<th>hostname [+sharing]</th>\n\\r
-<th style=\"text-align: right\">LMS</th>\n\\r
-<th style=\"text-align: right\">MB</th>\n\\r
-<th style=\"text-align: right\">MB</th>\n\\r
-<th style=\"text-align: right\">MB</th>\n\\r
-<th style=\"text-align: right\">MB</th>\n\\r
-<th style=\"text-align: right\">MB</th>\n\\r
-<th style=\"text-align: right\">kb/s</th>\n\\r
-<th style=\"text-align: right\">kb/s</th>\n\\r
-<th style=\"text-align: right\">kb/s</th>\n\\r
-<th>prio</th>\n\\r
-</tr></thead><tbody>\n",f); \r
-\r
- row_odd_even = 0;\r
- for_each(ip,ips) if(!use_jquery_popups || !ip->sharing)\r
+ char swchar='p';\r
+ if(start_shaping)\r
{\r
- char *f1="", *f2="";\r
- i++;\r
-\r
- if(ip->max < ip->desired) \r
- { \r
- f1="<span style=\"color:red\">"; \r
- f2="</span>"; \r
- limit_count++; \r
- } \r
- else if(ip->prio > highest_priority+1) \r
- { \r
- f1="<span style=\"color:brown\">"; \r
- f2="</span>"; \r
- prio_count++; \r
- } \r
-\r
-#ifdef DEBUG\r
- printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); \r
-#endif\r
- /* hostnames -------------------------------------- */\r
- fprintf(f,"%s<td style=\"text-align: right\"><a name=\"%s\"></a>%d</td><td><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", \r
- tr_odd_even(), ip->name, i, log_url, ip->name, ip->name);\r
-\r
- if(use_jquery_popups)\r
- {\r
- fprintf(f,"<span id=\"sharing_%d\" style=\"display:none\">",i);\r
- popup_button=0;\r
- for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
- {\r
- fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);\r
- popup_button++;\r
- }\r
- fputs("</span>\n",f);\r
- if(popup_button)\r
- {\r
- fprintf(f,"<span>[<a class=\"blue\" href=\"#\" onClick=\"$(this).parent().hide();$(\'#sharing_%d\').show();$(\'#download_%d\').show();$(\'#upload_%d\').show();return(false);\" style=\"cursor: pointer;\">+%d</a>]</span>",\r
- i, i, i, popup_button);\r
- }\r
- }\r
- fputs("</td>\n",f);\r
- /* ----------------------------------------------- */\r
-\r
- if(found_lmsid)\r
- {\r
- fputs("<td style=\"text-align: right\">",f);\r
- if(ip->lmsid > 0)\r
- {\r
- fprintf(f,"<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, 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 style=\"text-align: right\">%Lu</td>\n", ip->credit);\r
- fprintf(f,"<td style=\"text-align: right\"><span style=\"color:#%s\">%Lu</span></td>",\r
- ip->keyword->html_color,\r
- ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));\r
- fprintf(f,"<td style=\"text-align: right\">%s%Lu%s", f1, ip->traffic, f2);\r
-\r
- /* download --------------------------------------- */\r
- fprintf(f,"</td><td style=\"text-align: right\">%Lu", ip->direct);\r
- if(use_jquery_popups)\r
- {\r
- fprintf(f,"<span id=\"download_%d\" style=\"display:none\">",i);\r
- for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
- {\r
- fprintf(f,"<br />%Lu", sharedip->direct);\r
- }\r
- fputs("</span>\n",f);\r
- }\r
- fputs("</td>\n",f);\r
- /* ----------------------------------------------- */\r
-\r
- if(qos_proxy)\r
- {\r
- fprintf(f,"<td style=\"text-align: right\">%Lu</td>\n", ip->proxy);\r
- }\r
- /* upload ---------------------------------------- */\r
- fprintf(f,"<td style=\"text-align: right\">%Lu", ip->upload);\r
- if(use_jquery_popups)\r
- {\r
- fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">",i);\r
- for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
- {\r
- fprintf(f,"<br />%Lu", sharedip->upload);\r
- }\r
- fputs("</span>\n",f);\r
- }\r
- fputs("</td>\n",f);\r
- /* ----------------------------------------------- */\r
-\r
- fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%s%d%s</td>\n\\r
-<td>%s%d%s</td></tr>\n",\r
- ip->min, ip->desired, \r
- f1, ip->max, f2, \r
- f1, ip->prio, f2);\r
-\r
- total_traffic+=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
- if(!just_preview)\r
- {\r
- append_log(ip);\r
- for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
- {\r
- append_log(sharedip);\r
- }\r
- }\r
+ swchar='s';\r
}\r
- fprintf(f,"</tbody><thead><tr>\n\\r
-<th colspan=\"%d\" style=\"text-align: left\">%d CLASSES</th>", colspan-7, i);\r
- fprintf(f,"<th style=\"text-align: right\">%Lu</th><th style=\"text-align: right\">%Lu</th>\n", total_traffic, total_direct);\r
- if(qos_proxy)\r
+ else if(reduce_ceil)\r
{\r
- fprintf(f,"<th style=\"text-align: right\">%Lu</th>\n", total_proxy);\r
+ swchar='0'+reduce_ceil; /* -2, -4 */\r
}\r
- fprintf(f,"<th style=\"text-align: right\">%Lu</th>", total_upload);\r
- fprintf(f,"<th colspan=\"4\"><span style=\"color:red\">LIMIT %dx</span> <span style=\"color:brown\">LOW-PRIO %dx</span></th></tr>\n</thead></table>\n",limit_count,prio_count);\r
-\r
- row_odd_even = 0;\r
- if(active_classes>10)\r
+ else if(stop_shaping)\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 class=\"decorated last\"><caption>Enterprise Resource Planning (ERP)</caption>\n",f);\r
- fputs("<thead><tr>\n\\r
-<th>Analytic category</th>\n\\r
-<th colspan=\"2\" style=\"text-align: center\">Active Classes</th>\n\\r
-<th colspan=\"2\" style=\"text-align: center\">Data transfers</th>\n\\r
-</tr></thead><tbody>\n",f);\r
-\r
- if_exists(sum,sums,sum->l>=total_traffic/4)\r
- {\r
- fprintf(f,"%s<td>Top 25%% of traffic</td>\n", tr_odd_even());\r
- fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%d %%</td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
- sum->i, (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);\r
- }\r
- \r
- if_exists(sum,sums,sum->i==10)\r
- {\r
- fprintf(f,"%s<td>Top 10 downloaders</td>\n", tr_odd_even());\r
- fprintf(f,"<td style=\"text-align: right\"><strong>10</strong></td>\n\\r
-<td style=\"text-align: right\">%d %%</td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
- (100*sum->i+50)/active_classes, sum->l, (100*sum->l+50)/total_traffic);\r
- }\r
-\r
- if_exists(sum,sums,sum->l>=total_traffic/2)\r
- {\r
- fprintf(f,"%s<td>Top 50%% of traffic</td>\n", tr_odd_even());\r
- fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%d %%</td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\"><strong>%Ld %%</strong></td></tr>\n",\r
- sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
- }\r
-\r
- if_exists(sum,sums,sum->l>=4*total_traffic/5)\r
- {\r
- fprintf(f,"%s<td>Top 80%% of traffic</td>\n", tr_odd_even());\r
- fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%d %%</td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\"><strong>%Ld %%</strong></td></tr>\n",\r
- sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
- }\r
-\r
- if_exists(sum,sums,sum->i>=(active_classes+1)/5)\r
- {\r
- fprintf(f,"%s<td>Top 20%% downloaders</td>\n", tr_odd_even());\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_traffic;\r
- fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
- 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,"%s<td>Top 25%% downloaders</td>\n", tr_odd_even());\r
- fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%d %%</td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
- sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
- }\r
-\r
- if_exists(sum,sums,sum->i>=(active_classes+1)/2)\r
- {\r
- fprintf(f,"%s<td>Top 50%% downloaders</td>\n", tr_odd_even());\r
- fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\"><strong>%d %%</strong></td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\">%Ld %%</td></tr>\n",\r
- sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
- }\r
-\r
- if_exists(sum,sums,sum->i>=4*(active_classes+1)/5)\r
- {\r
- fprintf(f,"%s<td>Top 80%% downloaders</td>\n", tr_odd_even());\r
- fprintf(f,"<td style=\"text-align: right\">%d</td>\n\\r
-<td style=\"text-align: right\">%d %%</td>\n\\r
-<td style=\"text-align: right\">%Lu MB</td>\n\\r
-<td style=\"text-align: right\">%Ld %%</td></tr></tbody>\n",\r
- sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);\r
- }\r
-\r
- fprintf(f,"<thead><tr><th><a class=\"blue\" target=\"_blank\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);\r
- fprintf(f,"<th style=\"text-align: right\">%d</th>\n\\r
-<th style=\"text-align: right\">100 %%</th>\n\\r
-<th style=\"text-align: right\">%Lu MB</th>\n\\r
-<th style=\"text-align: right\">100 %%</th></tr>\n",active_classes,total_traffic);\r
- fputs("</thead></table>\n", f);\r
-\r
- /* write basic ERP data to log directory */\r
- if(!just_preview)\r
- {\r
- FILE *iplog;\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 M\t%Ld %%\tACTIVE %d\tTRAFFIC %Lu M\tCLASSES %d\tFUP-LIMIT %d\tLOW-PRIO %d\t%s",\r
- time(NULL), top20_count, top20_perc1, top20_sum, top20_perc2, \r
- active_classes, total_traffic, i, limit_count, prio_count, d); /* d = date*/\r
- fclose(iplog);\r
- }\r
- else\r
- {\r
- perror(str);\r
- }\r
- }\r
+ swchar='q';\r
}\r
\r
- fprintf(f, stats_html_signature, version);\r
- fclose(f);\r
- }\r
-\r
- if(just_preview)\r
- {\r
- char swchar='p';\r
- if(start_shaping)\r
- {\r
- swchar='s';\r
- }\r
printf("Statistics preview generated (-%c switch) - now exiting ...\n", swchar);\r
exit(0);\r
} \r
printf("%-22s %-15s mark\n","name","ip");\r
#endif\r
\r
- printf("Writing %s ... ", classmap); \r
+ printf("Writing %s", classmap); \r
f = fopen(classmap, "w"); \r
if(f < 0)\r
{\r
}\r
\r
/*-----------------------------------------------------------------*/\r
- puts("Generating iptables and tc classes ... ");\r
+ printf(" + generating iptables and tc classes ... ");\r
/*-----------------------------------------------------------------*/\r
\r
- for_each(ip, ips) if(ip->mark > 0)\r
+ for_each(ip, ips) if(ip->mark > 0) /* works only for IPv4 so far */\r
{\r
if(idxs)\r
{\r
char *buf;\r
duplicate(ip->addr,buf);\r
- buf=index_id(ip->addr,32-idxtable_bitmask1); \r
+ if(ip->v6)\r
+ {\r
+ buf=index6_id(ip->addr,64-idxtable_bitmask1);\r
+ }\r
+ else\r
+ {\r
+ buf=index_id(ip->addr,32-idxtable_bitmask1);\r
+ }\r
\r
string(chain_forward,6+strlen(buf));\r
strcpy(chain_forward,"forw_");\r
chain_postrouting="POSTROUTING";\r
}\r
\r
+ /* packet limits - this will be optional in future */\r
+ if(ip->pps_limit)\r
+ {\r
+ sprintf(limit_pkts, "-m limit --limit %d/s --limit-burst %d ", \r
+ ip->pps_limit, ip->pps_limit);\r
+ }\r
+ else\r
+ {\r
+ *limit_pkts = 0;\r
+ } \r
+\r
#ifdef DEBUG\r
- printf("%-22s %-16s %04d ", ip->name, ip->addr, ip->mark); \r
+ printf("%-22s %-16s %04d %d/s\n", ip->name, ip->addr, ip->mark, ip->pps_limit); \r
#endif\r
\r
- /* -------------------------------------------------------- mark download */\r
- \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
+ /* -------------------------------------------------------- mark download */ \r
+ sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",\r
+ chain_postrouting, ip->addr, ip->mask,\r
+ lan, mark_iptables, ip->mark);\r
+ iptables_save_line(str, ip->v6);\r
\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",\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
+ sprintf(str, "-A %s -s %s -p tcp --sport %d -d %s/%d -o %s -j %s%d",\r
+ chain_postrouting, proxy_ip, proxy_port, ip->addr,\r
+ ip->mask, lan, mark_iptables, ip->mark);\r
+ iptables_save_line(str, ip->v6);\r
}\r
+*/\r
+ sprintf(str, "-A %s -d %s/%d -o %s %s-j ACCEPT",\r
+ chain_postrouting, ip->addr, ip->mask, lan, limit_pkts);\r
+ iptables_save_line(str, ip->v6);\r
+\r
+ /* classify overlimit packets to separate overlimit class */\r
+ sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",\r
+ chain_postrouting, ip->addr, ip->mask,\r
+ lan, mark_iptables, OVERLIMIT_CLASS);\r
+ iptables_save_line(str, ip->v6);\r
\r
- sprintf(str, "-A %s -d %s/32 -o %s -j ACCEPT",\r
- chain_postrouting, ip->addr, lan);\r
- save_line(str);\r
+ sprintf(str, "-A %s -d %s/%d -o %s -j ACCEPT",\r
+ chain_postrouting, ip->addr, ip->mask, lan);\r
+ iptables_save_line(str, ip->v6);\r
\r
/* -------------------------------------------------------- mark upload */\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
+ sprintf(str, "-A %s -s %s/%d -o %s -j %s%d", \r
+ chain_forward, ip->addr, ip->mask, wan, mark_iptables, ip->mark);\r
+ iptables_save_line(str, ip->v6);\r
+\r
+ sprintf(str, "-A %s -s %s/%d -o %s %s-j ACCEPT",\r
+ chain_forward, ip->addr, ip->mask, wan, limit_pkts);\r
+ iptables_save_line(str, ip->v6);\r
\r
- sprintf(str, "-A %s -s %s/32 -o %s -j ACCEPT",\r
- chain_forward, ip->addr, wan);\r
- save_line(str);\r
+ /* classify overlimit packets to separate overlimit class */\r
+ sprintf(str, "-A %s -s %s/%d -o %s -j %s%d", \r
+ chain_forward, ip->addr, ip->mask, wan, mark_iptables, OVERLIMIT_CLASS);\r
+ iptables_save_line(str, ip->v6);\r
+\r
+ sprintf(str, "-A %s -s %s/%d -o %s -j ACCEPT",\r
+ chain_forward, ip->addr, ip->mask, wan);\r
+ iptables_save_line(str, ip->v6);\r
\r
if(ip->min)\r
{\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, lan, ip->group, ip->mark,ip->min,ip->max, burst, ip->prio);\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
{\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
+ 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
\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",\r
- tc, lan, ip->mark, ip->mark);\r
- safe_run(str);\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
\r
if(strcmpi(ip->keyword->leaf_discipline, "none"))\r
{\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
+ 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
\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",\r
- tc, wan, ip->mark, ip->mark);\r
- safe_run(str);\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
+ fprintf(f, "%s %d\n", ip->addr, ip->mark);\r
}\r
}\r
else\r
\r
if(idxs)\r
{\r
- chain_forward = "forw_common";\r
- chain_postrouting = "post_common";\r
+ chain_forward = "forw_common";\r
+ chain_postrouting = "post_common";\r
}\r
else\r
{\r
- chain_forward = "FORWARD";\r
- chain_postrouting = "POSTROUTING";\r
+ chain_forward = "FORWARD";\r
+ chain_postrouting = "POSTROUTING";\r
}\r
- /* -------------------------------- classify or reject free download */\r
+\r
+ if(free_min)\r
{\r
- char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */\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",\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",\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
- save_line(str);\r
- }\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
- save_line(str);\r
- }\r
- sprintf(str,"-A %s -o %s -j %s", chain_forward, wan, final_chain);\r
- save_line(str);\r
+ final_chain = "ACCEPT";\r
+ }\r
+\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",\r
+ chain_postrouting,proxy_ip,proxy_port,lan,mark_iptables, 3);\r
+ iptables_save_line(str, FALSE); // only for IPv4\r
+ }\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
+ iptables_save_line(str, FALSE); // only for IPv4\r
+ }\r
+*/\r
+\r
+ if(free_min)\r
+ {\r
+ sprintf(str, "-A %s -o %s -j %s%d",\r
+ chain_postrouting, lan, mark_iptables, FREE_CLASS);\r
+ iptables_save_line(str, FALSE); /* only for IPv4 */\r
+ }\r
+\r
+ sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);\r
+ iptables_save_line(str, FALSE);\r
+ if(ip6prefix)\r
+ {\r
+ sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);\r
+ iptables_save_line(str, TRUE);\r
+ }\r
+\r
+ if(free_min)\r
+ {\r
+ sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, FREE_CLASS);\r
+ iptables_save_line(str, FALSE); /* only for IPv4 */\r
+ }\r
+\r
+ sprintf(str,"-A %s -o %s -j %s", chain_forward, wan, final_chain);\r
+ iptables_save_line(str, FALSE);\r
+ if(ip6prefix)\r
+ {\r
+ sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);\r
+ iptables_save_line(str, TRUE);\r
}\r
\r
if(free_min) /* allocate free bandwith if it is not zero... */ \r
{\r
/*-----------------------------------------------------------------*/\r
- puts("Generating free bandwith classes ...");\r
+ puts("Generating free bandwith class ...");\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
+ 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, parent, FREE_CLASS, 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
+ 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, parent, FREE_CLASS, free_min, free_max, burst, lowest_priority);\r
safe_run(str);\r
/* tc SFQ */\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:%d handle %d %s", tc, lan, FREE_CLASS, FREE_CLASS, 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:%d handle %d %s", tc, wan, FREE_CLASS, FREE_CLASS, 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 %d fw flowid 1:%d", tc, lan, FREE_CLASS, FREE_CLASS);\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 %d fw flowid 1:%d", tc, wan, FREE_CLASS, FREE_CLASS);\r
+ safe_run(str);\r
+\r
+ /*-----------------------------------------------------------------*/\r
+ puts("Generating bandwith class for overlimit packets...");\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, lan, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority);\r
+ safe_run(str);\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, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority);\r
safe_run(str);\r
}\r
printf("Total IP count: %d\n", i);\r
- run_restore(); \r
+ run_iptables_restore();\r
if(log_file)\r
{\r
fclose(log_file);\r
GIT.Harvie.CZ / svn / Prometheus-QoS / .git / blobdiff