X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;ds=sidebyside;f=prometheus.c;h=a243c16242c3ad38625232e6110ea0d8e9c7dcd5;hb=3335365b0903d2b1baf7331d17203490cdee65ea;hp=62ebbc8b3e2fa8eb94eeea1684096f9f0905d668;hpb=0b9c3c198771800cc6c5fbacfc0272549626bcfd;p=svn%2FPrometheus-QoS%2F.git
diff --git a/prometheus.c b/prometheus.c
index 62ebbc8..a243c16 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -1,12 +1,13 @@
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* Prometheus QoS - you can "steal fire" from your ISP *//* "fair-per-IP" quality of service (QoS) utility */
+/* 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-2015 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, 20151020
ludva, 20080415
Prometheus QoS is free software; you can redistribute it and/or
@@ -28,10 +29,10 @@
#include "cll1-0.6.2.h"
#include "ipstruct.h"
-const char *version = "0.8.3-i";
+const char *version = "0.8.5-d";
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* Versions: 0.8.3 is development release, 0.8.4 will be "stable" */
+/* Versions: 0.8.5 is development release, 0.8.6 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 */
@@ -39,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-2015 Michael Polak, Arachne Labs\n";
#define STRLEN 512
#undef DEBUG
@@ -57,6 +58,7 @@ 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 *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/
char *ip6tablesfile = "/var/spool/prometheus.ip6tables"; /* temporary file for ip6tables-restore*/
char *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */
@@ -83,6 +85,7 @@ char *mark = "MARK";
char *mark_iptables = "MARK --set-mark ";
int dry_run = FALSE; /* preview - use puts() instead of system() */
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;
FILE *ip6tables_file = NULL;
int enable_credit = TRUE; /* enable credit file */
@@ -96,18 +99,20 @@ 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 qos_proxy = TRUE; include proxy port to QoS */
int found_lmsid = 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 */
+/* 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 */
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 max_nesting = 5; /* /include/uapi/linux/pkt_sched.h: #define TC_HTB_MAXDEPTH 8 [... - 3 parent classes] */
int htb_r2q = 256; /* should work for leaf values 512 kbps to 8 Mbps */
int burst = 8; /* HTB burst (in kbits) */
int burst_main = 64;
@@ -116,28 +121,28 @@ 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;
+
+#define FREE_CLASS 3
+#define OVERLIMIT_CLASS 4
void help(void);
/* implemented in help.c */
-void get_traffic_statistics(const char *whichiptables);
+void get_traffic_statistics(const char *whichiptables, int ipv6);
/* implemented in parseiptables.c */
void parse_ip_log(int argc, char **argv);
@@ -152,6 +157,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;
@@ -215,24 +229,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++;
@@ -248,17 +264,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 ||
@@ -305,12 +324,14 @@ void get_config(char *config_filename)
ioption("use-jquery-popups",use_jquery_popups);
option("qos-free-zone",qos_free_zone);
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);
@@ -335,10 +356,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"))
@@ -437,22 +458,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) ? :-)) */
@@ -463,13 +472,16 @@ 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; /* 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;
@@ -479,7 +491,7 @@ program
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-2015 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);
@@ -492,9 +504,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
argument("-f") { run=TRUE; just_flush=TRUE; }
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("-a") { run=TRUE; just_networks=TRUE; }
argument("-l") { just_logs=TRUE; }
argument("-m") { just_logs=TRUE; }
argument("-y") { just_logs=TRUE; }
@@ -529,7 +545,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
if(althosts)
{
- hosts=althosts;
+ hosts = althosts;
}
if(just_flush<9)
@@ -537,37 +553,80 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
/*-----------------------------------------------------------------*/
puts("Parsing iptables verbose output ...");
/*-----------------------------------------------------------------*/
- get_traffic_statistics(iptables);
+ get_traffic_statistics(iptables, FALSE);
if(ip6prefix)
{
/*-----------------------------------------------------------------*/
puts("Parsing ip6tables verbose output ...");
/*-----------------------------------------------------------------*/
- get_traffic_statistics(ip6tables);
+ get_traffic_statistics(ip6tables, TRUE);
}
}
/*-----------------------------------------------------------------*/
- 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 macro definition file %s ...\n", macrosfile);
/*-----------------------------------------------------------------*/
- string(str,STRLEN);
+ 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);
+ if(just_networks)
+ {
+ analyse_topology("/usr/sbin/traceroute -n -m 10 -w 2 %s.%d");
+ exit(-1);
+ }
/*-----------------------------------------------------------------*/
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;
- ip->traffic=0;
- ip->mark=sharedip->mark;
- ip->lmsid=sharedip->lmsid;
+ 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->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)
@@ -584,7 +643,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,_))
@@ -596,6 +655,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
done; /* ugly macro end */
}
+
if(!just_preview)
{
/*-----------------------------------------------------------------*/
@@ -619,6 +679,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
exit(-1);
}
iptables_save_line(iptablespreamble, TRUE);
+ iptables_save_line(ip6preamble, TRUE);
}
run_iptables_restore();
@@ -628,8 +689,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
{
perror(cmdlog);
exit(-1);
- }
-
+ }
sprintf(str,"%s qdisc del dev %s root 2>/dev/null",tc,lan);
safe_run(str);
@@ -643,6 +703,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
{
ip6tables_file=fopen(ip6tablesfile,"w");
iptables_save_line(iptablespreamble, TRUE);
+ iptables_save_line(ip6preamble, TRUE);
}
if(qos_free_zone && *qos_free_zone!='0') /* this is currently supported only for IPv4 */
@@ -652,6 +713,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
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)
{
iptables_save_line(":post_noproxy - [0:0]", FALSE);
@@ -664,10 +726,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
chain="post_noproxy";
}
+
else
{
- chain="POSTROUTING";
- }
+*/
+ chain = "POSTROUTING";
+// }
sprintf(str,"-A %s -s %s -o %s -j ACCEPT", chain, qos_free_zone, lan);
iptables_save_line(str, FALSE);
@@ -942,8 +1006,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) /* apply FUP limit immediately.... */
+ int unshape_this_ip;
+ 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: %lu 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: %lu Mbps avg: %ld Mbps)\n", agreg, ip->name, min_mbps, avg_mbps_up);
+ }
+ else
+ {
+ unshape_this_ip = 1;
+ }
+ }
+ if(stop_shaping)
{
- printf("Applying limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark);
- printf("(down: %dk-%dk ", ip->min, ip->max);
+ 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;
+ 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 %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;
+ }
+ }
+ if(print_stats)
+ {
+ printf("(down: %dk-%dk wants %dk, ", 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",
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));
+ if(print_stats)
+ {
+ printf("up: %dk-%dk wants %dk)\n", (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",
tc, wan, ip->group, ip->mark,
(int)((ip->min/ip->keyword->asymetry_ratio)-ip->keyword->asymetry_fixed),
@@ -1010,6 +1156,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
perror(classmap);
puts("Warning - classmap file not fund, just generating preview ...");
start_shaping=FALSE;
+ stop_shaping=FALSE;
}
done; /* ugly macro end */
}
@@ -1037,6 +1184,15 @@ 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';
+ }
+
printf("Statistics preview generated (-%c switch) - now exiting ...\n", swchar);
exit(0);
}
@@ -1046,7 +1202,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
printf("%-22s %-15s mark\n","name","ip");
#endif
- printf("Writing %s ... ", classmap);
+ printf("Writing %s", classmap);
f = fopen(classmap, "w");
if(f < 0)
{
@@ -1054,7 +1210,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
}
/*-----------------------------------------------------------------*/
- puts("Generating iptables and tc classes ... ");
+ printf(" + generating iptables and tc classes ... ");
/*-----------------------------------------------------------------*/
for_each(ip, ips) if(ip->mark > 0) /* works only for IPv4 so far */
@@ -1088,35 +1244,66 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
chain_postrouting="POSTROUTING";
}
+ /* 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;
+ }
+
#ifdef DEBUG
- printf("%-22s %-16s %04d ", ip->name, ip->addr, ip->mark);
+ printf("%-22s %-16s %04d %d/s\n", ip->name, ip->addr, ip->mark, ip->pps_limit);
#endif
- /* -------------------------------------------------------- mark download */
-
+ /* -------------------------------------------------------- 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 */
+ chain_postrouting, ip->addr, ip->mask,
+ lan, mark_iptables, ip->mark);
iptables_save_line(str, ip->v6);
+/*
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);
+ chain_postrouting, proxy_ip, proxy_port, ip->addr,
+ ip->mask, lan, mark_iptables, ip->mark);
iptables_save_line(str, ip->v6);
}
+*/
+ sprintf(str, "-A %s -d %s/%d -o %s %s-j ACCEPT",
+ chain_postrouting, ip->addr, ip->mask, lan, limit_pkts);
+ iptables_save_line(str, ip->v6);
+
+ /* classify overlimit packets to separate overlimit class */
+ sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",
+ chain_postrouting, ip->addr, ip->mask,
+ lan, mark_iptables, OVERLIMIT_CLASS);
+ 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);
+ chain_postrouting, ip->addr, ip->mask, 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);
+ chain_forward, ip->addr, ip->mask, wan, mark_iptables, ip->mark);
+ iptables_save_line(str, ip->v6);
+
+ sprintf(str, "-A %s -s %s/%d -o %s %s-j ACCEPT",
+ chain_forward, ip->addr, ip->mask, wan, limit_pkts);
+ iptables_save_line(str, ip->v6);
+
+ /* classify overlimit packets to separate overlimit class */
+ sprintf(str, "-A %s -s %s/%d -o %s -j %s%d",
+ chain_forward, ip->addr, ip->mask, wan, mark_iptables, OVERLIMIT_CLASS);
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);
+ chain_forward, ip->addr, ip->mask, wan);
iptables_save_line(str, ip->v6);
if(ip->min)
@@ -1127,7 +1314,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
#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);
+ tc, lan, ip->group, ip->mark, ip->min, ip->max, burst, ip->prio);
safe_run(str);
if(strcmpi(ip->keyword->leaf_discipline, "none"))
@@ -1205,23 +1392,25 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
final_chain = "ACCEPT";
}
+/*
if(qos_proxy)
{
if(free_min)
{
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 */
+ iptables_save_line(str, FALSE); // only for IPv4
}
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 */
+ 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);
+ chain_postrouting, lan, mark_iptables, FREE_CLASS);
iptables_save_line(str, FALSE); /* only for IPv4 */
}
@@ -1235,7 +1424,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
if(free_min)
{
- sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, 3);
+ sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, FREE_CLASS);
iptables_save_line(str, FALSE); /* only for IPv4 */
}
@@ -1250,28 +1439,38 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
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);
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",
+ tc, lan, parent, FREE_CLASS, 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",
+ tc, wan, parent, FREE_CLASS, free_min, free_max, burst, lowest_priority);
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);
+ sprintf(str,"%s qdisc add dev %s parent 1:%d handle %d %s", tc, lan, FREE_CLASS, FREE_CLASS, 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, wan, 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, lan, FREE_CLASS, FREE_CLASS);
+ safe_run(str);
+
+ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, wan, 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);
+ /*-----------------------------------------------------------------*/
+ 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",
+ tc, lan, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority);
+ safe_run(str);
+ sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d",
+ tc, wan, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority);
safe_run(str);
}
printf("Total IP count: %d\n", i);