X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;ds=sidebyside;f=prometheus.c;h=d8069b89661bc1aa747247495dd58cc1b881bd56;hb=HEAD;hp=70b0953b5da168e415953e3ca0a418fabdbb37bf;hpb=3f76726a95b374e0f3b405b6e07f1ed3f565df01;p=svn%2FPrometheus-QoS%2F.git
diff --git a/prometheus.c b/prometheus.c
index 70b0953..8aacb50 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -2,12 +2,12 @@
/* Prometheus QoS - you can "steal fire" from your ISP */
/* "fair-per-IP" quality of service (QoS) utility */
/* requires Linux 2.4.x or 2.6.x with HTB support */
-/* Copyright(C) 2005-2013 Michael Polak, Arachne Aerospace */
+/* Copyright(C) 2005-2020 Michael Polak, Arachne Aerospace */
/* iptables-restore support Copyright(C) 2007-2008 ludva */
/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* Modified by: xChaos, 20130124
+/* Modified by: xChaos, 20231028
ludva, 20080415
Prometheus QoS is free software; you can redistribute it and/or
@@ -29,10 +29,10 @@
#include "cll1-0.6.2.h"
#include "ipstruct.h"
-const char *version = "0.8.3-i";
+const char *version = "1.0.1";
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* Versions: 0.8.3 is development release, 0.8.4 will be "stable" */
+/* Versions: 0.9.0 is development release, 1.0 will be "stable" */
/* Official Trac URL: https://dev.arachne.cz/svn/prometheus */
/* Official SVN URL: https://dev.arachne.cz/repos/prometheus */
/* BTC donations account: 19rriLx8vR19wGefPaMhakqnCYNYwjLvxq */
@@ -40,7 +40,7 @@ const char *version = "0.8.3-i";
/* Warning: unofficial Github mirror is not supported by author! */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-const char *stats_html_signature = "Statistics generated by Prometheus QoS version %s
GPL+Copyright(C)2005-2013 Michael Polak, Arachne Labs\n";
+const char *stats_html_signature = "Statistics generated by Prometheus QoS version %s
GPL+Copyright(C)2005-2020 Michael Polak, Arachne Labs\n";
#define STRLEN 512
#undef DEBUG
@@ -58,7 +58,12 @@ const char *ls = "/bin/ls"; /* this is not user configurable :-) *
char *config = "/etc/prometheus/prometheus.conf"; /* main configuration file */
char *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition file */
+char *macrosfile = "/etc/prometheus/prometheus.macros"; /* rewrite rules for most common tariffs */
+char *upstreamfile = "/etc/prometheus/upstream.interfaces"; /* list of interfaces to manage */
+char *downstreamfile = "/etc/prometheus/downstream.interfaces"; /* list of interfaces to manage */
+char *qosfreefile = "/etc/prometheus/qosfree.interfaces"; /* list of interfaces to manage */
char *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/
+char *iptablesdump = "/var/spool/prometheus.iptables-dump"; /* temporary file for iptables -L -v -x -n -t mangle */
char *ip6tablesfile = "/var/spool/prometheus.ip6tables"; /* temporary file for ip6tables-restore*/
char *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */
char *classmap = "/var/lib/misc/prometheus.classes"; /* credit log file */
@@ -82,7 +87,8 @@ int filter_type = 1; /*1 mark, 2 classify*/
char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */
char *mark = "MARK";
char *mark_iptables = "MARK --set-mark ";
-int dry_run = FALSE; /* preview - use puts() instead of system() */
+int dry_run = FALSE; /* preview commands - use puts() instead of system() */
+int skip_stats = FALSE; /* skip generating statistics */
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]";
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";
FILE *iptables_file = NULL;
@@ -91,26 +97,30 @@ int enable_credit = TRUE; /* enable credit file */
int use_credit = FALSE; /* use credit file (if enabled)*/
char *title = "Hall of Fame - Greatest Suckers"; /* hall of fame title */
int hall_of_fame = TRUE; /* enable hall of fame */
-char *lan = "eth0"; /* LAN interface */
-char *lan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */
-char *wan = "eth1"; /* WAN/ISP interface */
+char *medium = "1000Mbit"; /* 10Mbit/100Mbit ethernet */
+//obsolete: char *lan = "eth0"; /* LAN interface */
+//obsolete: char *lan_medium = "1000Mbit"; /* 10Mbit/100Mbit ethernet */
char *ip6prefix = NULL; /* Prefix for global /48 IPv6 subnet */
-char *wan_medium = "100Mbit"; /* 10Mbit/100Mbit ethernet */
char *qos_leaf = "sfq perturb 5"; /* leaf discipline */
char *qos_free_zone = NULL; /* QoS free zone */
-int qos_proxy = TRUE; /* include proxy port to QoS */
-int found_lmsid = FALSE; /* show links to users in LMS information system */
+char *qos_free_dst_ipset = NULL; /* QoS free zone - dst match ipset name, must be prepared outside prometheus */
+char *qos_free_src_ipset = NULL; /* QoS free zone - src match ipset name, must be prepared outside prometheus */
+/* int qos_proxy = TRUE; include proxy port to QoS */
+int found_code = FALSE; /* show links to users in LMS information system */
int include_upload = TRUE; /* upload+download=total traffic */
-char *proxy_ip = "192.168.1.1/32"; /* our IP with proxy port */
-int proxy_port = 3128; /* proxy port number */
-long long int line = 1024; /* WAN/ISP download in kbps */
-long long int up = 1024; /* WAN/ISP upload in kbps */
+/* char *proxy_ip = "192.168.1.1/32"; our IP with proxy port */
+/* int proxy_port = 3128; proxy port number */
+//obsolete: long long int line = 1024; /* WAN/ISP download in kbps */
+//obsolete: long long int up = 1024; /* WAN/ISP upload in kbps */
int free_min = 256; /* minimum guaranted bandwidth for all undefined hosts */
int free_max = 512; /* maximum allowed bandwidth for all undefined hosts */
+int overlimit_min = 256; /* minimum guaranted bandwidth for all undefined hosts */
+int overlimit_max = 512; /* maximum allowed bandwidth for all undefined hosts */
int qos_free_delay = 0; /* seconds to sleep before applying new QoS rules */
int digital_divide = 2; /* controls digital divide weirdness ratio, 1...3 */
-int max_nesting = 3; /* maximum nesting of HTB clases, built-in maximum seems to be 4 */
-int htb_r2q = 256; /* should work for leaf values 512 kbps to 8 Mbps */
+int max_nesting = 5; /* /include/uapi/linux/pkt_sched.h: #define TC_HTB_MAXDEPTH 8 [... - 3 parent classes] */
+//obsolete: int htb_r2q = 256; /* should work for leaf values 512 kbps to 8 Mbps */
+int htb_quantum = 1514; /* MTU + ethernet header */
int burst = 8; /* HTB burst (in kbits) */
int burst_main = 64;
int burst_group = 32;
@@ -118,23 +128,26 @@ int magic_treshold = 8; /* reduce ceil by X*magic_treshhold kbps (hard shapi
int keywordcount = 0;
int class_count = 0;
int ip_count = 0;
-/* not yet implemented:
-int fixed_packets = 0; maximum number of pps per IP address (not class!)
-int packet_limit = 5; maximum number of pps to htn CEIL, not rate !!!
-*/
FILE *log_file = NULL;
char *kwd = "via-prometheus"; /* /etc/hosts comment, eg. #qos-64-128 */
const int highest_priority = 0; /* highest HTB priority (HTB built-in value is 0) */
-const int lowest_priority = 7; /* lowest HTB priority (HTB built-in value is 7) */
+const int lowest_priority = 7; /* lowest HTB priority /include/uapi/linux/pkt_sched.h: #define TC_HTB_NUMPRIO 8 */
const int idxtable_treshold1 = 24; /* this is no longer configurable */
const int idxtable_treshold2 = 12; /* this is no longer configurable */
const int idxtable_bitmask1 = 3; /* this is no longer configurable */
const int idxtable_bitmask2 = 3; /* this is no longer configurable */
-struct IP *ips = NULL, *ip, *sharedip;
+struct IP *ips = NULL, *networks = NULL, *ip, *sharedip;
struct Group *groups = NULL, *group;
-struct Keyword *keyword, *defaultkeyword=NULL, *keywords=NULL;
+struct Keyword *keyword, *defaultkeyword=NULL, *keywords = NULL;
+struct Macro *macro, *macros = NULL;
+struct Index *idxs = NULL, *idx, *metaindex;
+struct Interface *interfaces = NULL, *interface;
+struct QosFreeInterface *qosfreeinterfaces = NULL, *qosfreeinterface;
+
+#define FREE_CLASS 3
+#define OVERLIMIT_CLASS 4
void help(void);
/* implemented in help.c */
@@ -154,6 +167,15 @@ void write_json_traffic(char *json);
void write_htmlandlogs(char *html, char *d, int total, int just_preview);
/* implemented in htmlandlogs.c */
+void analyse_topology(char *traceroute);
+/* implemented in networks.c */
+
+char *parse_datafile_line(char *str);
+/* implemented in utils.c */
+
+time_t get_mtime(const char *path);
+/* implemented in utils.c */
+
const char *tr_odd_even(void)
{
row_odd_even = 1 - row_odd_even;
@@ -167,21 +189,6 @@ const char *tr_odd_even(void)
}
}
-/* ==== This is C<<1 stuff - learn C<<1 first! https://dev.arachne.cz/svn/cll1h ==== */
-/* (except that this code uses obsolete, archaic version of this header file...) */
-
-struct Index
-{
- char *addr;
- char *id;
- struct Index *parent;
- int bitmask;
- int children;
- int ipv6;
- list(Index);
-} *idxs=NULL, *idx, *metaindex;
-
-
/* ====== iptables indexes are used to reduce complexity to log8(N) ===== */
char *index_id(char *ip, int bitmask);
@@ -217,24 +224,26 @@ void get_config(char *config_filename)
printf("%s ",kwd);
create(keyword,Keyword);
- keyword->key=kwd;
- keyword->asymetry_ratio=1; /* ratio for ADSL-like upload */
- keyword->asymetry_fixed=0; /* fixed treshold for ADSL-like upload */
- keyword->data_limit=8; /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */
- keyword->data_prio=4; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */
- keyword->fixed_limit=0; /* fixed data limit for setting lower HTB ceil */
- keyword->fixed_prio=0; /* fixed data limit for setting lower HTB prio */
- keyword->reserve_min=8; /* bonus for nominal HTB rate bandwidth (in kbps) */
- keyword->reserve_max=0; /* malus for nominal HTB ceil (in kbps) */
- keyword->default_prio=highest_priority+1;
- keyword->html_color="000000";
- keyword->ip_count=0;
- keyword->leaf_discipline="";
-
- push(keyword,keywords);
+ keyword->key = kwd;
+ keyword->asymetry_ratio = 1; /* ratio for ADSL-like upload */
+ keyword->asymetry_fixed = 0; /* fixed treshold for ADSL-like upload */
+ keyword->data_limit = 8; /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */
+ keyword->data_prio = 4; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */
+ keyword->fixed_limit = 0; /* fixed data limit for setting lower HTB ceil */
+ keyword->fixed_prio = 0; /* fixed data limit for setting lower HTB prio */
+ keyword->reserve_min = 8; /* bonus for nominal HTB rate bandwidth (in kbps) */
+ keyword->reserve_max = 0; /* malus for nominal HTB ceil (in kbps) */
+ keyword->default_prio = highest_priority+1;
+ keyword->download_aggregation = keyword->upload_aggregation = 0; /* disable by default */
+ keyword->html_color = "000000";
+ keyword->ip_count = 0;
+ keyword->leaf_discipline = "";
+ keyword->allowed_avgmtu = 0;
+
+ push(keyword, keywords);
if(!defaultkeyword)
{
- defaultkeyword=keyword;
+ defaultkeyword = keyword;
}
keywordcount++;
@@ -250,17 +259,20 @@ void get_config(char *config_filename)
{
char *tmptr=_; /* <---- l+1 ----> */
_+=l+1; /* via-prometheus-asymetry-ratio, etc. */
- ioption("asymetry-ratio",keyword->asymetry_ratio);
- ioption("asymetry-treshold",keyword->asymetry_fixed);
- ioption("magic-relative-limit",keyword->data_limit);
- ioption("magic-relative-prio",keyword->data_prio);
- loption("magic-fixed-limit",keyword->fixed_limit);
- loption("magic-fixed-prio",keyword->fixed_prio);
- ioption("htb-default-prio",keyword->default_prio);
- ioption("htb-rate-bonus",keyword->reserve_min);
- ioption("htb-ceil-malus",keyword->reserve_max);
- option("leaf-discipline",keyword->leaf_discipline);
- option("html-color",keyword->html_color);
+ foption("asymetry-ratio", keyword->asymetry_ratio);
+ ioption("asymetry-treshold", keyword->asymetry_fixed);
+ ioption("magic-relative-limit", keyword->data_limit);
+ ioption("magic-relative-prio", keyword->data_prio);
+ loption("magic-fixed-limit", keyword->fixed_limit);
+ loption("magic-fixed-prio", keyword->fixed_prio);
+ ioption("htb-default-prio", keyword->default_prio);
+ ioption("htb-rate-bonus", keyword->reserve_min);
+ ioption("htb-ceil-malus", keyword->reserve_max);
+ ioption("download-aggregation", keyword->download_aggregation);
+ ioption("upload-aggregation", keyword->upload_aggregation);
+ option("leaf-discipline", keyword->leaf_discipline);
+ option("html-color", keyword->html_color);
+ ioption("allowed-avgmtu" ,keyword->allowed_avgmtu);
_=tmptr;
if(keyword->data_limit || keyword->fixed_limit ||
@@ -280,16 +292,17 @@ void get_config(char *config_filename)
option("ip6tables-save",ip6tablessave);
option("ip6tables-restore",ip6tablesrestore);
option("iptables-in-filename",iptablesfile);
+ option("iptables-dump-filename",iptablesdump);
option("ip6tables-in-filename",ip6tablesfile);
option("hosts",hosts);
- option("lan-interface",lan);
- option("wan-interface",wan);
+ option("downstream-interfaces-list-filename",downstreamfile);
+ option("upstream-interfaces-list-filename",upstreamfile);
+ option("qos-free-interfaces-list-filename",qosfreefile);
+ option("macros-filename",macrosfile);
option("ip6-prefix",ip6prefix);
- option("lan-medium",lan_medium);
- option("wan-medium",wan_medium);
- lloption("wan-download",line);
- lloption("wan-upload",up);
+ option("medium",medium);
ioption("hall-of-fame-enable",hall_of_fame);
+ ioption("digital-divide-weirdness-ratio",digital_divide);
option("hall-of-fame-title",title);
option("hall-of-fame-filename",html);
option("json-filename",json_traffic);
@@ -306,18 +319,22 @@ void get_config(char *config_filename)
option("lms-url",lms_url);
ioption("use-jquery-popups",use_jquery_popups);
option("qos-free-zone",qos_free_zone);
+ option("qos-free-dst-ipset",qos_free_dst_ipset);
+ option("qos-free-src-ipset",qos_free_src_ipset);
ioption("qos-free-delay",qos_free_delay);
- ioption("qos-proxy-enable",qos_proxy);
- option("qos-proxy-ip",proxy_ip);
+/* ioption("qos-proxy-enable",qos_proxy); */
+/* option("qos-proxy-ip",proxy_ip);*/
option("htb-leaf-discipline",qos_leaf);
- ioption("qos-proxy-port",proxy_port);
+/* ioption("qos-proxy-port",proxy_port); */
ioption("free-rate",free_min);
ioption("free-ceil",free_max);
+ ioption("overlimit-rate",overlimit_min);
+ ioption("overlimit-ceil",overlimit_max);
ioption("htb-burst",burst);
ioption("htb-burst-main",burst_main);
ioption("htb-burst-group",burst_group);
ioption("htb-nesting-limit",max_nesting);
- ioption("htb-r2q",htb_r2q);
+ ioption("htb-quantum",htb_quantum);
ioption("magic-include-upload",include_upload);
ioption("magic-treshold",magic_treshold);
option("filter-type", cnf);
@@ -337,10 +354,10 @@ void get_config(char *config_filename)
/* leaf discipline for keywords */
for_each(keyword,keywords)
{
- if(!strcmpi(keyword->leaf_discipline, ""))
- {
- keyword->leaf_discipline = qos_leaf;
- }
+ if(!strcmpi(keyword->leaf_discipline, ""))
+ {
+ keyword->leaf_discipline = qos_leaf;
+ }
}
if(strcmpi(cnf, "mark"))
@@ -355,17 +372,10 @@ void get_config(char *config_filename)
mark = "MARK";
mark_iptables = "MARK --set-mark ";
}
-
- /* are supplied values meaningful ?*/
- if(line<=0 || up<=0)
- {
- puts("Illegal value of LAN or WAN bandwidth: 0 kbps.");
- reject_config_and_exit(config_filename);
- }
}
-/* ========== This function executes, logs OR ALSO prints command ========== */
+/* ========== This function executes, logs or also prints command ========== */
void safe_run(char *cmd)
{
@@ -395,16 +405,20 @@ void iptables_save_line(char *line, int ipv6)
}
}
+#define IPv4 FALSE
+#define IPv6 TRUE
+
+
void run_iptables_restore(void)
{
char *restor;
- string(restor,STRLEN);
+ string(restor, STRLEN);
/*-----------------------------------------------------------------*/
printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);
/*-----------------------------------------------------------------*/
- iptables_save_line("COMMIT", FALSE);
+ iptables_save_line("COMMIT", IPv4);
fclose(iptables_file);
if(dry_run)
{
@@ -423,7 +437,7 @@ void run_iptables_restore(void)
/*-----------------------------------------------------------------*/
printf("Running %s <%s ...\n", ip6tablesrestore, ip6tablesfile);
/*-----------------------------------------------------------------*/
- iptables_save_line("COMMIT", TRUE);
+ iptables_save_line("COMMIT", IPv6);
fclose(ip6tables_file);
if(dry_run)
{
@@ -439,22 +453,10 @@ void run_iptables_restore(void)
free(restor);
}
-char *parse_datafile_line(char *str)
-{
- char *ptr=strchr(str,' ');
-
- if(ptr)
- {
- *ptr=0;
- ptr++;
- return ptr;
- }
- else
- {
- return NULL;
- }
-}
+/**/
+char *parse_datafile_line(char *str);
+time_t get_mtime(const char *path);
/*-----------------------------------------------------------------*/
/* Are you looking for int main(int argc, char **argv) ? :-)) */
@@ -465,24 +467,25 @@ program
int i=0; /* just plain old Fortran style integer :-) */
FILE *f=NULL; /* everything is just stream of bytes... */
char *str, *ptr, *d; /* LET A$=B$ :-) */
- char *substring;
+ char *substring, *limit_pkts;
int parent = 1;
+ int just_networks = FALSE;
int just_flush = FALSE; /* deactivates all previous actions */
int nodelay = FALSE;
int just_preview = FALSE; /* preview - generate just stats */
int start_shaping = FALSE; /* apply FUP - requires classmap file */
- int stop_shaping = FALSE; /* apply FUP - requires classmap file */
+ int stop_shaping = FALSE; /* lift FUP - requires classmap file */
+ int reduce_ceil = 0; /* allow only rate+(ceil-rate)/2, /4, etc. */
int just_logs = FALSE; /* just parse logs */
int run = FALSE;
int total = 0;
- char *chain_forward, *chain_postrouting;
char *althosts=NULL;
printf("\n\
Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\
-Version %s - Copyright (C)2005-2013 Michael Polak, Arachne Labs\n\
+Version %s - Copyright (C)2005-2017 Michael Polak, Arachne Labs\n\
iptables-restore & burst tunning & classify modification by Ludva\n\
Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
@@ -496,9 +499,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
argument("-9") { run=TRUE; just_flush=9; }
argument("-p") { run=TRUE; just_preview=TRUE; }
argument("-q") { run=TRUE; just_preview=TRUE; stop_shaping=TRUE; }
+ argument("-2") { run=TRUE; just_preview=TRUE; reduce_ceil=2; }
+ argument("-4") { run=TRUE; just_preview=TRUE; reduce_ceil=4; }
argument("-s") { run=TRUE; just_preview=TRUE; start_shaping=TRUE; }
argument("-r") { run=TRUE; }
argument("-n") { run=TRUE; nodelay=TRUE; }
+ argument("-b") { run=TRUE; nodelay=TRUE; skip_stats=TRUE; }
+ argument("-a") { run=TRUE; just_networks=TRUE; }
argument("-l") { just_logs=TRUE; }
argument("-m") { just_logs=TRUE; }
argument("-y") { just_logs=TRUE; }
@@ -519,6 +526,57 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
printf("Parsing configuration file %s ...\n", config);
/*-----------------------------------------------------------------*/
get_config(config);
+ /*-----------------------------------------------------------------*/
+ printf("Parsing upstream interfaces list %s ...\n", upstreamfile);
+ /*-----------------------------------------------------------------*/
+ parse(upstreamfile)
+ {
+ ptr = parse_datafile_line(_);
+ if(ptr)
+ {
+ create(interface, Interface);
+ interface->name = _;
+ interface->speed = (long long)atol(ptr);
+ /* is supplied value meaningful ?*/
+ if(interface->speed <= 0)
+ {
+ printf("Illegal value of %s interface bandwidth.\n", interface->name);
+ reject_config_and_exit(upstreamfile);
+ }
+ interface->is_upstream = TRUE;
+ interface->chain = "FORWARD";
+ interface->idxprefix = "forw";
+ push(interface, interfaces);
+ printf("Upstream interface %s: medium %s capacity %Ld kbps\n", interface->name, medium, interface->speed);
+ }
+ }
+ done; /* ugly macro end */
+
+ /*-----------------------------------------------------------------*/
+ printf("Parsing downstream interfaces list %s ...\n", downstreamfile);
+ /*-----------------------------------------------------------------*/
+ parse(downstreamfile)
+ {
+ ptr = parse_datafile_line(_);
+ if(ptr)
+ {
+ create(interface, Interface);
+ interface->name = _;
+ interface->speed = (long long)atol(ptr);
+ /* is supplied value meaningful ?*/
+ if(interface->speed <= 0)
+ {
+ printf("Illegal value of %s interface bandwidth.\n", interface->name);
+ reject_config_and_exit(downstreamfile);
+ }
+ interface->is_upstream = FALSE;
+ interface->chain = "POSTROUTING";
+ interface->idxprefix = "post";
+ push(interface, interfaces);
+ printf("Downstream interface %s: medium %s capacity %Ld kbps\n", interface->name, medium, interface->speed);
+ }
+ }
+ done; /* ugly macro end */
if(just_logs)
{
@@ -533,10 +591,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
if(althosts)
{
- hosts=althosts;
+ hosts = althosts;
}
- if(just_flush<9)
+ if(just_flush<9 && !skip_stats)
{
/*-----------------------------------------------------------------*/
puts("Parsing iptables verbose output ...");
@@ -552,26 +610,100 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
}
/*-----------------------------------------------------------------*/
- printf("Parsing class defintion file %s ...\n", hosts);
+ /* cll1.h - let's allocate brand new character buffer... */
/*-----------------------------------------------------------------*/
- parse_hosts(hosts);
+ string(str, STRLEN);
+ string(limit_pkts, STRLEN);
/*-----------------------------------------------------------------*/
- /* cll1.h - let's allocate brand new character buffer... */
+ printf("Parsing qos free interfaces file %s ...\n", qosfreefile);
/*-----------------------------------------------------------------*/
- string(str,STRLEN);
+ load(qosfreeinterface, qosfreeinterfaces,
+ qosfreefile, QosFreeInterface, name);
+
+ /*-----------------------------------------------------------------*/
+ printf("Parsing macro definition file %s ...\n", macrosfile);
+ /*-----------------------------------------------------------------*/
+ parse(macrosfile)
+ {
+ ptr = parse_datafile_line(_);
+ if(ptr)
+ {
+ create(macro, Macro);
+ macro->rewrite_from = _;
+ macro->rewrite_to = ptr;
+ push(macro, macros);
+ printf("%s -> %s\n", macro->rewrite_from, macro->rewrite_to);
+ }
+ }
+ done; /* ugly macro end */
+
+
+
+ /*-----------------------------------------------------------------*/
+ printf("Parsing class defintion file %s ...\n", hosts);
+ /*-----------------------------------------------------------------*/
+ parse_hosts(hosts);
+
+#ifdef MONITORINGTRHU_CTU
+//special hack only to generate certain required CSV statistics for www.ctu.cz (regulation body)
+//not required for everyday use, requires special syntax sugar in hosts file, see parsehosts.c
+ for_each(technology, technologies)
+ {
+ char *filename;
+ FILE *f;
+ string(filename, strlen(log_dir) + strlen(technology->filename) + 5);
+ strcpy(filename, log_dir);
+ strcat(filename, technology->filename);
+ strcat(filename, ".csv");
+ /*-----------------------------------------------------------------*/
+ printf("Writing report file %s ...\n", filename);
+ /*-----------------------------------------------------------------*/
+ f = fopen(filename, "w");
+ if(f)
+ {
+ for_each(ip, ips) if(eq(technology->filename, ip->technology_str))
+ {
+ fprintf(f,"%s,%s,%d\n", ip->code, ip->ruian_id_str, ip->max);
+ }
+ fclose(f);
+ }
+ else
+ perror(filename);
+ }
+#endif
/*-----------------------------------------------------------------*/
puts("Resolving shared connections ...");
/*-----------------------------------------------------------------*/
- for_each(ip,ips) if(ip->sharing)
+ for_each(ip, ips) if(ip->sharing)
{
- for_each(sharedip,ips) if(eq(sharedip->name, ip->sharing))
+ for_each(sharedip, ips) if(eq(sharedip->name, ip->sharing))
{
sharedip->traffic += ip->traffic;
+ sharedip->traffic_down += ip->direct;
+ sharedip->traffic_up += ip->upload;
ip->traffic = 0;
ip->mark = sharedip->mark;
- ip->lmsid = sharedip->lmsid;
+ ip->code = sharedip->code;
+ ip->pps_limit = sharedip->pps_limit; /* no other way to do this */
+
+ /* Ugly hack: append IPv4 addresses of sharedip to IPv6 uplinks */
+ ptr = strchr(ip->addr, '+');
+ if(ptr && ptr-ip->addr > 1 && !sharedip->v6)
+ {
+ *(--ptr) = 0;
+ concatenate(ip->addr, sharedip->addr, ptr);
+ ip->name = ip->addr = ptr;
+ ptr = strchr(ip->addr, '.');
+ while(ptr && *ptr)
+ {
+ *ptr = ':';
+ ptr = strchr(ptr, '.');
+ }
+ ip->mask += 64;
+ }
+
break;
}
if(not sharedip)
@@ -588,7 +720,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
/*-----------------------------------------------------------------*/
parse(credit)
{
- ptr=parse_datafile_line(_);
+ ptr = parse_datafile_line(_);
if(ptr)
{
if_exists(ip,ips,eq(ip->addr,_))
@@ -600,6 +732,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
done; /* ugly macro end */
}
+
if(!just_preview)
{
/*-----------------------------------------------------------------*/
@@ -612,7 +745,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
perror(iptablesfile);
exit(-1);
}
- iptables_save_line(iptablespreamble, FALSE);
+ iptables_save_line(iptablespreamble, IPv4);
if(ip6prefix)
{
@@ -622,8 +755,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
perror(ip6tablesfile);
exit(-1);
}
- iptables_save_line(iptablespreamble, TRUE);
- iptables_save_line(ip6preamble, TRUE);
+ iptables_save_line(iptablespreamble, IPv6);
+ iptables_save_line(ip6preamble, IPv6);
}
run_iptables_restore();
@@ -635,47 +768,65 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
exit(-1);
}
- sprintf(str,"%s qdisc del dev %s root 2>/dev/null",tc,lan);
- safe_run(str);
-
- sprintf(str,"%s qdisc del dev %s root 2>/dev/null",tc,wan);
- safe_run(str);
+ for_each(interface, interfaces)
+ {
+ sprintf(str,"%s qdisc del dev %s root 2>/dev/null", tc, interface->name);
+ safe_run(str);
+ }
iptables_file=fopen(iptablesfile,"w");
- iptables_save_line(iptablespreamble, FALSE);
+ iptables_save_line(iptablespreamble, IPv4);
if(ip6prefix)
{
ip6tables_file=fopen(ip6tablesfile,"w");
- iptables_save_line(iptablespreamble, TRUE);
- iptables_save_line(ip6preamble, TRUE);
+ iptables_save_line(iptablespreamble, IPv6);
+ iptables_save_line(ip6preamble, IPv6);
}
- if(qos_free_zone && *qos_free_zone!='0') /* this is currently supported only for IPv4 */
+ /* this doesn't seem to be way to go... about 2/3 of all packets have ACK flag set
+ maybe with --length 40:100 it would make some sense, but not enought
+ for_each(interface, interfaces)
{
- char *chain;
-
- sprintf(str,"-A FORWARD -d %s -o %s -j ACCEPT", qos_free_zone, wan);
- iptables_save_line(str, FALSE); /* this is currently supported only for IPv4 */
-
- if(qos_proxy)
+ sprintf(str,"-A %s -m tcp -p tcp --tcp-flags ACK ACK -o %s -j ACCEPT", interface->chain, interface->name);
+ iptables_save_line(str, IPv4);
+ }
+ */
+
+ if(qos_free_zone && *qos_free_zone != '0') /* this is currently supported only for IPv4 */
+ {
+ for_each(interface, interfaces)
{
- iptables_save_line(":post_noproxy - [0:0]", FALSE);
- sprintf(str,"-A POSTROUTING ! -p tcp -o %s -j post_noproxy", lan);
- iptables_save_line(str , FALSE);
- sprintf(str,"-A POSTROUTING ! -s %s -o %s -j post_noproxy", proxy_ip, lan);
- iptables_save_line(str, FALSE);
- sprintf(str,"-A POSTROUTING -s %s -p tcp ! --sport %d -o %s -j post_noproxy", proxy_ip, proxy_port, lan);
- iptables_save_line(str, FALSE);
-
- chain="post_noproxy";
+ sprintf(str,"-A %s -%c %s -o %s -j ACCEPT", interface->chain, (interface->is_upstream?'d':'s'), qos_free_zone, interface->name);
+ iptables_save_line(str, IPv4);
}
- else
+ }
+
+ if(qos_free_dst_ipset && *qos_free_dst_ipset != '0') /* this is currently supported only for IPv4 */
+ {
+ for_each(interface, interfaces)
{
- chain="POSTROUTING";
+ sprintf(str,"-A %s -m set --match-set %s %s -o %s -j ACCEPT", interface->chain, qos_free_dst_ipset, (interface->is_upstream?"dst":"src"), interface->name);
+ iptables_save_line(str, IPv4);
+ }
+ }
+
+ if(qos_free_src_ipset && *qos_free_src_ipset != '0') /* this is currently supported only for IPv4 */
+ {
+ for_each(interface, interfaces)
+ {
+ sprintf(str,"-A %s -m set --match-set %s %s -o %s -j ACCEPT", interface->chain, qos_free_src_ipset, (interface->is_upstream?"src":"dst"), interface->name);
+ iptables_save_line(str, IPv4);
}
-
- sprintf(str,"-A %s -s %s -o %s -j ACCEPT", chain, qos_free_zone, lan);
- iptables_save_line(str, FALSE);
+ }
+
+ for_each(qosfreeinterface, qosfreeinterfaces)
+ {
+ sprintf(str,"-A FORWARD -i %s -j ACCEPT", qosfreeinterface->name);
+ iptables_save_line(str, IPv4);
+ iptables_save_line(str, IPv6);
+ sprintf(str,"-A POSTROUTING -o %s -j ACCEPT", qosfreeinterface->name);
+ iptables_save_line(str, IPv4);
+ iptables_save_line(str, IPv6);
}
if(ip_count > idxtable_treshold1 && !just_flush)
@@ -686,12 +837,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
printf("Detected %d addresses - indexing iptables rules to improve performance...\n",ip_count);
/*-----------------------------------------------------------------*/
- iptables_save_line(":post_common - [0:0]", FALSE);
- iptables_save_line(":forw_common - [0:0]", FALSE);
+ iptables_save_line(":post_common - [0:0]", IPv4);
+ iptables_save_line(":forw_common - [0:0]", IPv4);
if(ip6prefix)
{
- iptables_save_line(":post_common - [0:0]", TRUE);
- iptables_save_line(":forw_common - [0:0]", TRUE);
+ iptables_save_line(":post_common - [0:0]", IPv6);
+ iptables_save_line(":forw_common - [0:0]", IPv6);
}
for_each(ip,ips) if(ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0"))
@@ -764,7 +915,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
sort(idx,idxs,order_by,bitmask);
i=0;
- for_each(idx,idxs)
+ for_each(idx, idxs)
{
if(idx->ipv6)
{
@@ -782,53 +933,38 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
sprintf(str,":forw_%s - [0:0]", idx->id);
iptables_save_line(str, idx->ipv6);
- if(idx->parent)
+ for_each(interface, interfaces)
{
- string(buf,strlen(idx->parent->id)+6);
- sprintf(buf,"post_%s", idx->parent->id);
- }
- else
- {
- buf="POSTROUTING";
- }
-
- sprintf(str,"-A %s -d %s/%d -o %s -j post_%s", buf, subnet, idx->bitmask, lan, idx->id);
- iptables_save_line(str, idx->ipv6);
+ if(idx->parent)
+ {
+ string(buf, strlen(idx->parent->id)+6);
+ sprintf(buf, "%s_%s", interface->idxprefix, idx->parent->id);
+ }
+ else
+ {
+ buf = interface->chain;
+ }
- sprintf(str,"-A %s -d %s/%d -o %s -j post_common", buf, subnet, idx->bitmask, lan);
- iptables_save_line(str, idx->ipv6);
+ sprintf(str, "-A %s -%c %s/%d -o %s -j %s_%s",
+ buf, (interface->is_upstream?'s':'d'), subnet, idx->bitmask, interface->name, interface->idxprefix, idx->id);
+ iptables_save_line(str, idx->ipv6);
- if(idx->parent)
- {
- string(buf,strlen(idx->parent->id)+6);
- sprintf(buf,"forw_%s",idx->parent->id);
- }
- else
- {
- buf="FORWARD";
+ sprintf(str, "-A %s -%c %s/%d -o %s -j %s_common",
+ buf, (interface->is_upstream?'s':'d'), subnet, idx->bitmask, interface->name, interface->idxprefix);
+ iptables_save_line(str, idx->ipv6);
}
-
- sprintf(str,"-A %s -s %s/%d -o %s -j forw_%s", buf, subnet, idx->bitmask, wan, idx->id);
- iptables_save_line(str, idx->ipv6);
-
- sprintf(str,"-A %s -s %s/%d -o %s -j forw_common", buf, subnet, idx->bitmask, wan);
- iptables_save_line(str, idx->ipv6);
}
printf("Total indexed iptables chains created: %d\n", i);
- sprintf(str,"-A FORWARD -o %s -j forw_common", wan);
- iptables_save_line(str, FALSE);
-
- sprintf(str,"-A POSTROUTING -o %s -j post_common", lan);
- iptables_save_line(str, FALSE);
-
- if(ip6prefix)
+ for_each(interface, interfaces)
{
- sprintf(str,"-A FORWARD -o %s -j forw_common", wan);
- iptables_save_line(str, TRUE);
-
- sprintf(str,"-A POSTROUTING -o %s -j post_common", lan);
- iptables_save_line(str, TRUE);
+ sprintf(str,"-A %s -o %s -j %s_common", interface->chain, interface->name, interface->idxprefix);
+ iptables_save_line(str, IPv4);
+ if(ip6prefix)
+ {
+ sprintf(str,"-A %s -o %s -j %s_common", interface->chain, interface->name, interface->idxprefix);
+ iptables_save_line(str, IPv6);
+ }
}
}
}
@@ -848,32 +984,24 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
{
if(!dry_run && !nodelay && qos_free_delay)
{
- printf("Flushed iptables and tc classes - now sleeping for %d seconds...\n",qos_free_delay);
+ printf("Flushed iptables and tc classes - now sleeping for %d seconds...\n", qos_free_delay);
sleep(qos_free_delay);
}
- sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",
- tc,lan,htb_r2q);
- safe_run(str);
-
- sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d",
- tc,lan,lan_medium,lan_medium,burst_main,highest_priority);
- safe_run(str);
-
- sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d",
- tc,lan,line,line,burst_main,highest_priority);
- safe_run(str);
-
- sprintf(str,"%s qdisc add dev %s root handle 1: htb r2q %d default 1",tc,wan,htb_r2q);
- safe_run(str);
+ for_each(interface, interfaces)
+ {
+ sprintf(str, "%s qdisc add dev %s root handle 1: htb default 1",
+ tc, interface->name);
+ safe_run(str);
- sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d",
- tc,wan,wan_medium,wan_medium,burst_main,highest_priority);
- safe_run(str);
+ sprintf(str, "%s class add dev %s parent 1: classid 1:2 htb rate %s ceil %s burst %dk prio %d quantum %d",
+ tc, interface->name, medium, medium, burst_main, highest_priority, htb_quantum);
+ safe_run(str);
- sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d",
- tc,wan,up,up,burst_main,highest_priority);
- safe_run(str);
+ sprintf(str, "%s class add dev %s parent 1:2 classid 1:1 htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d quantum %d",
+ tc, interface->name, interface->speed, interface->speed, burst_main, highest_priority, htb_quantum);
+ safe_run(str);
+ }
}
/*-----------------------------------------------------------------*/
@@ -882,38 +1010,32 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
sort(ip,ips,desc_order_by,traffic);
/*-----------------------------------------------------------------*/
- /* sub-scope - local variables */
+ for_each(interface, interfaces)
{
- long long int rate = line;
- long long int max = line;
+ long long int rate = interface->speed;
+ long long int max = interface->speed;
int group_count = 0;
- FILE *credit_file = NULL;
+ //obsolete: FILE *credit_file = NULL;
- if(!just_preview && !dry_run && enable_credit)
- {
- credit_file = fopen(credit,"w");
- }
-
+ //obsolete: if(!just_preview && !dry_run && enable_credit)
+ //obsolete: {
+ //obsolete: credit_file = fopen(credit,"w");
+ //obsolete: }
+
for_each(group,groups)
{
if(!just_preview)
{
- //download
- sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d #down desired %d",
- tc, lan, parent, group->id, rate, max, burst_group, highest_priority+1, group->desired);
- safe_run(str);
-
- //upload
- sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d #up desired %d",
- tc, wan, parent, group->id, rate*up/line, max*up/line, burst_group, highest_priority+1, group->desired);
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %Ldkbit ceil %Ldkbit burst %dk prio %d quantum %d #down desired %d",
+ tc, interface->name, parent, group->id, rate, max, burst_group, highest_priority+1, htb_quantum, group->desired);
safe_run(str);
}
-
+
if(group_count++ < max_nesting)
{
parent = group->id;
}
-
+
rate -= digital_divide*group->min;
if(rate < group->min)
{
@@ -921,6 +1043,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
}
/*shaping of aggresive downloaders, with credit file support */
+ /* obsolete
if(use_credit)
{
int group_rate = group->min, priority_sequence = lowest_priority;
@@ -947,8 +1070,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
{
if( ip->keyword->data_prio
&& !ip->fixedprio
- && ( ip->traffic>ip->credit
- + (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20))) )
+ && ( ip->traffic > ip->credit + (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20))) )
{
ip->prio=priority_sequence--;
if(ip->prioaddr,_))
{
- ip->mark=atoi(ptr);
- if(ip->max < ip->desired || stop_shaping) /* apply or disable FUP limit immediately.... */
+ int unshape_this_ip = 0;
+ long avg_mbps_down = ip->traffic_down * 8 / how_much_seconds;
+ long avg_mbps_up = ip->traffic_up * 8 / how_much_seconds;
+ int agreg = 1, print_stats = 1;
+
+ if(ip->keyword->download_aggregation)
+ {
+ int min_mbps = (ip->min/ip->keyword->download_aggregation)>>10;
+ if(min_mbps < 1)
+ {
+ min_mbps = 1;
+ }
+
+ if(min_mbps <= avg_mbps_down)
+ {
+ unshape_this_ip = 0;
+ agreg = (int)((float)(avg_mbps_down+1)/min_mbps+.5);
+ ip->max /= agreg;
+ ip->pps_limit /= agreg;
+ printf("Download aggregation 1:%d for %s (min: %d Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_down);
+ }
+ else
+ {
+ unshape_this_ip = 1;
+ }
+ }
+ else if(ip->keyword->upload_aggregation)
+ {
+ int min_mbps = (ip->min/ip->keyword->upload_aggregation)>>10;
+ if(min_mbps < 1)
+ {
+ min_mbps = 1;
+ }
+
+ if(min_mbps <= avg_mbps_up)
+ {
+ unshape_this_ip = 0;
+ agreg = (int)((float)(avg_mbps_up+1)/min_mbps+.5);
+ ip->max /= agreg;
+ printf("Upload aggregation 1:%d for %s: (min: %d Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_up);
+ }
+ else
+ {
+ unshape_this_ip = 1;
+ }
+ }
+ if(stop_shaping)
{
- if(stop_shaping)
+ unshape_this_ip = 1;
+ }
+ ip->aggregated = agreg;
+ ip->mark = atoi(ptr);
+ if(ip->max < ip->desired || unshape_this_ip || reduce_ceil) /* apply or disable FUP limit immediately.... */
+ {
+ if(unshape_this_ip)
{
ip->max = ip->desired;
- printf("Removing limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark);
+ if(stop_shaping) /* all limits removed, but not printed with -s (start_shaping) switch */
+ {
+ printf("Removing limit for %s (%s) ", ip->name, ip->addr);
+ }
+ else
+ {
+ print_stats = 0;
+ }
}
else
{
- printf("Applying limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark);
+ printf("Updating %s (%s) ", ip->name, ip->addr);
+ if(reduce_ceil)
+ {
+ ip->max = ip->min + (ip->desired-ip->min)/reduce_ceil;
+ }
+ else if(ip->max < ip->min)
+ {
+ ip->max = ip->min;
+ }
+ }
+ for_each(interface, interfaces)
+ {
+ if(!interface->is_upstream)
+ {
+ if(print_stats)
+ {
+ printf("[down %s: %dk-%dk wants %d]", interface->name, ip->min, ip->max, ip->desired);
+ }
+ sprintf(str, "%s class change dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d quantum %d",
+ tc, interface->name, ip->group, ip->mark, ip->min, ip->max, burst, ip->prio, htb_quantum);
+ safe_run(str);
+ }
+ else
+ {
+ if(print_stats)
+ {
+ printf("[up %s: %dk-%dk wants %dk]", interface->name, (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),
+ (int)((ip->desired/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),
+ (int)((ip->desired/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed));
+ }
+ sprintf(str,"%s class change dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d quantum %d",
+ tc, interface->name, ip->group, ip->mark,
+ (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),
+ (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio, htb_quantum);
+ safe_run(str);
+ }
+ }
+ if(print_stats)
+ {
+ printf("\n");
}
- printf("(down: %dk-%dk ", ip->min, ip->max);
- sprintf(str, "%s class change 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);
- safe_run(str);
- printf("up: %dk-%dk)\n", (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),
- (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed));
- sprintf(str,"%s class change dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",
- tc, wan, ip->group, ip->mark,
- (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),
- (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio);
- safe_run(str);
}
}
}
@@ -1031,7 +1242,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
json_traffic=json_preview;
}
- if(!dry_run && !just_flush)
+ if(!dry_run && !just_flush && !skip_stats)
{
/*-----------------------------------------------------------------*/
printf("Writing json traffic overview %s ... ", json_traffic);
@@ -1042,6 +1253,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
printf("Writing statistics into HTML page %s ...\n", html);
/*-----------------------------------------------------------------*/
write_htmlandlogs(html, d, total, just_preview);
+ printf("\n");
}
if(just_preview)
@@ -1051,6 +1263,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
{
swchar='s';
}
+ else if(reduce_ceil)
+ {
+ swchar='0'+reduce_ceil; /* -2, -4 */
+ }
else if(stop_shaping)
{
swchar='q';
@@ -1073,226 +1289,183 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
}
/*-----------------------------------------------------------------*/
- printf(" + generating iptables and tc classes ... ");
+ printf(" + generating iptables and tc classes ... \n");
/*-----------------------------------------------------------------*/
- for_each(ip, ips) if(ip->mark > 0) /* works only for IPv4 so far */
+ for_each(ip, ips) if(ip->mark > 0)
{
- if(idxs)
+ for_each(interface, interfaces)
{
- char *buf;
- duplicate(ip->addr,buf);
- if(ip->v6)
+ char *chain;
+ if(idxs)
{
- buf=index6_id(ip->addr,64-idxtable_bitmask1);
+ char *buf;
+ duplicate(ip->addr,buf);
+ if(ip->v6)
+ {
+ buf=index6_id(ip->addr,64-idxtable_bitmask1);
+ }
+ else
+ {
+ buf=index_id(ip->addr,32-idxtable_bitmask1);
+ }
+
+ string(chain, 6+strlen(buf));
+ sprintf(chain, "%s_", interface->idxprefix);
+ strcat(chain, buf);
+
+ free(buf);
}
else
{
- buf=index_id(ip->addr,32-idxtable_bitmask1);
+ chain = interface->chain;
}
-
- string(chain_forward,6+strlen(buf));
- strcpy(chain_forward,"forw_");
- strcat(chain_forward,buf);
- string(chain_postrouting,6+strlen(buf));
- strcpy(chain_postrouting,"post_");
- strcat(chain_postrouting,buf);
-
- free(buf);
- }
- else
- {
- chain_forward="FORWARD";
- chain_postrouting="POSTROUTING";
- }
-
-#ifdef DEBUG
- printf("%-22s %-16s %04d ", ip->name, ip->addr, ip->mark);
-#endif
+ /* packet limits - this will be optional in future */
+ if(ip->pps_limit)
+ {
+ sprintf(limit_pkts, "-m limit --limit %d/s --limit-burst %d ",
+ ip->pps_limit, ip->pps_limit);
+ }
+ else
+ {
+ *limit_pkts = 0;
+ }
- /* -------------------------------------------------------- mark download */
-
- sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",
- chain_postrouting, ip->addr, 32*(1+ip->v6), lan, mark_iptables, ip->mark);
- /* -m limit --limit 1/s */
- iptables_save_line(str, ip->v6);
+ #ifdef DEBUG
+ printf("%-22s %-16s %04d %d/s\n", ip->name, ip->addr, ip->mark, ip->pps_limit);
+ #endif
- if(qos_proxy)
- {
- sprintf(str, "-A %s -s %s -p tcp --sport %d -d %s/%d -o %s -j %s%d",
- chain_postrouting, proxy_ip, proxy_port, ip->addr, 32*(1+ip->v6), lan, mark_iptables, ip->mark);
+ /* ------------------------------------------------ iptables classify */
+ sprintf(str, "-A %s -%c %s/%d -o %s -j %s%d",
+ chain, (interface->is_upstream?'s':'d'), ip->addr, ip->mask,
+ interface->name, mark_iptables, ip->mark);
iptables_save_line(str, ip->v6);
- }
-
- sprintf(str, "-A %s -d %s/%d -o %s -j ACCEPT",
- chain_postrouting, ip->addr, 32*(1+ip->v6), lan);
- iptables_save_line(str, ip->v6);
-
- /* -------------------------------------------------------- mark upload */
- sprintf(str, "-A %s -s %s/%d -o %s -j %s%d",
- chain_forward, ip->addr, 32*(1+ip->v6), wan, mark_iptables, ip->mark);
- iptables_save_line(str, ip->v6);
-
- sprintf(str, "-A %s -s %s/%d -o %s -j ACCEPT",
- chain_forward, ip->addr, 32*(1+ip->v6), wan);
- iptables_save_line(str, ip->v6);
-
- if(ip->min)
- {
- /* -------------------------------------------------------- download class */
-#ifdef DEBUG
- printf("(down: %dk-%dk ", ip->min, ip->max);
-#endif
- 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);
- safe_run(str);
+ sprintf(str, "-A %s -%c %s/%d -o %s %s-j ACCEPT",
+ chain, (interface->is_upstream?'s':'d'),ip->addr, ip->mask,
+ interface->name, limit_pkts);
+ iptables_save_line(str, ip->v6);
- if(strcmpi(ip->keyword->leaf_discipline, "none"))
+ if(*limit_pkts) /* non-empty string?*/
{
- 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*/
- safe_run(str);
+ /* classify overlimit packets to separate overlimit class */
+ sprintf(str, "-A %s -%c %s/%d -o %s -j %s%d",
+ chain, (interface->is_upstream?'s':'d'), ip->addr, ip->mask,
+ interface->name, mark_iptables, OVERLIMIT_CLASS);
+ iptables_save_line(str, ip->v6);
+
+ sprintf(str, "-A %s -%c %s/%d -o %s -j ACCEPT",
+ chain, (interface->is_upstream?'s':'d'), ip->addr, ip->mask,
+ interface->name);
+ iptables_save_line(str, ip->v6);
}
- if(filter_type == 1)
+ if(ip->min)
{
- sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",
- tc, lan, ip->mark, ip->mark);
- safe_run(str);
- }
-
- /* -------------------------------------------------------- upload class */
-#ifdef DEBUG
- printf("up: %dk-%dk)\n", (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),
- (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed));
-#endif
-
- sprintf(str,"%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",
- tc, wan, ip->group, ip->mark,
- (int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),
- (int)((ip->max/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed), burst, ip->prio);
- safe_run(str);
+ //TODO - min and max should not exceed interface->speed
- if(strcmpi(ip->keyword->leaf_discipline, "none"))
- {
- 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*/
- safe_run(str);
- }
+ /* -------------------------------------------------------- tc class */
+ #ifdef DEBUG
+ printf("[down: %dk-%dk]", ip->min, ip->max);
+ #endif
- if(filter_type == 1)
- {
- sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",
- tc, wan, ip->mark, ip->mark);
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d quantum %d",
+ tc, interface->name, ip->group, ip->mark, ip->min, ip->max, burst, ip->prio, htb_quantum);
safe_run(str);
+
+ if(strcmpi(ip->keyword->leaf_discipline, "none"))
+ {
+ sprintf(str, "%s qdisc add dev %s parent 1:%d handle %d %s",
+ tc, interface->name, ip->mark, ip->mark, ip->keyword->leaf_discipline); /*qos_leaf*/
+ safe_run(str);
+ }
+
+ if(filter_type == 1)
+ {
+ sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",
+ tc, interface->name, ip->mark, ip->mark);
+ safe_run(str);
+ }
}
-
- if(f > 0)
+ else
{
- fprintf(f, "%s %d\n", ip->addr, ip->mark);
+ #ifdef DEBUG
+ printf("(sharing %s)\n", ip->sharing);
+ #endif
}
+ i++;
}
- else
+ if(ip->min && f > 0)
{
-#ifdef DEBUG
- printf("(sharing %s)\n", ip->sharing);
-#endif
+ fprintf(f, "%s %d\n", ip->addr, ip->mark);
}
- i++;
+ printf(".");
}
if(f > 0)
{
- puts("done.");
+ puts(" done.");
fclose(f);
}
-
- if(idxs)
- {
- chain_forward = "forw_common";
- chain_postrouting = "post_common";
- }
- else
- {
- chain_forward = "FORWARD";
- chain_postrouting = "POSTROUTING";
- }
- if(free_min)
+ for_each(interface, interfaces)
{
- final_chain = "ACCEPT";
- }
-
- if(qos_proxy)
- {
- if(free_min)
+ char *chain;
+ if(idxs)
{
- 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);
- iptables_save_line(str, FALSE); /* only for IPv4 */
+ string(chain, STRLEN);
+ sprintf(chain, "%s_common", interface->idxprefix);
+ }
+ else
+ {
+ chain = interface->chain;
}
- sprintf(str, "-A %s -s %s -p tcp --sport %d -o %s -j %s",
- chain_postrouting,proxy_ip,proxy_port,lan,final_chain);
- iptables_save_line(str, FALSE); /* only for IPv4 */
- }
-
- if(free_min)
- {
- sprintf(str, "-A %s -o %s -j %s%d",
- chain_postrouting, lan, mark_iptables, 3);
- iptables_save_line(str, FALSE); /* only for IPv4 */
- }
- sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);
- iptables_save_line(str, FALSE);
- if(ip6prefix)
- {
- sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);
- iptables_save_line(str, TRUE);
- }
+ if(free_min)
+ {
+ final_chain = "ACCEPT";
- if(free_min)
- {
- sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, 3);
- iptables_save_line(str, FALSE); /* only for IPv4 */
- }
+ sprintf(str, "-A %s -o %s -j %s%d",
+ chain, interface->name, mark_iptables, FREE_CLASS);
+ iptables_save_line(str, IPv4); /* only for IPv4 */
+ }
- sprintf(str,"-A %s -o %s -j %s", chain_forward, wan, final_chain);
- iptables_save_line(str, FALSE);
- if(ip6prefix)
- {
- sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);
- iptables_save_line(str, TRUE);
- }
+ sprintf(str,"-A %s -o %s -j %s", chain, interface->name, final_chain);
+ iptables_save_line(str, IPv4);
+ if(ip6prefix)
+ {
+ sprintf(str,"-A %s -o %s -j %s", chain, interface->name, final_chain);
+ iptables_save_line(str, IPv6);
+ }
- if(free_min) /* allocate free bandwith if it is not zero... */
- {
+ if(free_min) /* allocate free bandwith if it is not zero... */
+ {
/*-----------------------------------------------------------------*/
- puts("Generating free bandwith classes ...");
+ puts("Generating free bandwith class ...");
/*-----------------------------------------------------------------*/
- sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d",
- tc, lan, parent, free_min, free_max,burst, lowest_priority);
- safe_run(str);
- sprintf(str, "%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio %d",
- tc, wan, parent, free_min, free_max, burst, lowest_priority);
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d quantum %d",
+ tc, interface->name, parent, FREE_CLASS, free_min, free_max,burst, lowest_priority, htb_quantum);
safe_run(str);
/* tc SFQ */
if(strcmpi(qos_leaf, "none"))
{
- sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s", tc, lan, qos_leaf);
- safe_run(str);
-
- sprintf(str,"%s qdisc add dev %s parent 1:3 handle 3 %s", tc, wan, qos_leaf);
+ sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, interface->name, FREE_CLASS, FREE_CLASS, qos_leaf);
safe_run(str);
}
/* tc handle 1 fw flowid */
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3", tc, lan);
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, interface->name, FREE_CLASS, FREE_CLASS);
safe_run(str);
-
- sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3", tc, wan);
+ }
+ if(*limit_pkts) /* non-empty string?*/
+ {
+ /*-----------------------------------------------------------------*/
+ puts("Generating bandwith class for overlimit packets...");
+ /*-----------------------------------------------------------------*/
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d quantum %d",
+ tc, interface->name, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority, htb_quantum);
safe_run(str);
- }
+ }
+ }
printf("Total IP count: %d\n", i);
run_iptables_restore();
if(log_file)