X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=03b75543d8964c125fc87c03b48995d74505b162;hp=70bea1f2355559c9dca504dde27523d95bc36558;hb=64b2d1255780905c78973df33145c93ee5613c9c;hpb=f64d54310ae39276c552b80183ae2320789bb4be
diff --git a/prometheus.c b/prometheus.c
index 70bea1f..03b7554 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-2014 Michael Polak, Arachne Aerospace */
/* iptables-restore support Copyright(C) 2007-2008 ludva */
/* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* Modified by: xChaos, 20130116
+/* Modified by: xChaos, 20140812
ludva, 20080415
Prometheus QoS is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
#include "cll1-0.6.2.h"
#include "ipstruct.h"
-const char *version = "0.8.3-h";
+const char *version = "0.8.5-b";
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
/* Versions: 0.8.3 is development release, 0.8.4 will be "stable" */
@@ -40,7 +40,7 @@ const char *version = "0.8.3-h";
/* 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-2014 Michael Polak, Arachne Labs\n";
#define STRLEN 512
#undef DEBUG
@@ -58,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 */
@@ -79,11 +80,14 @@ int row_odd_even = 0; /* */
/* === Configuraration file values defaults - stored in global variables ==== */
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() */
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 */
int use_credit = FALSE; /* use credit file (if enabled)*/
char *title = "Hall of Fame - Greatest Suckers"; /* hall of fame title */
@@ -95,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 = 32; /* minimum guaranted bandwidth for all undefined hosts */
-int free_max = 64; /* maximum allowed bandwidth for all undefined hosts */
+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;
@@ -115,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);
@@ -151,6 +157,10 @@ 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 */
+
+
const char *tr_odd_even(void)
{
row_odd_even = 1 - row_odd_even;
@@ -174,6 +184,7 @@ struct Index
struct Index *parent;
int bitmask;
int children;
+ int ipv6;
list(Index);
} *idxs=NULL, *idx, *metaindex;
@@ -186,6 +197,12 @@ char *index_id(char *ip, int bitmask);
char *subnet_id(char *ip, int bitmask);
/* function implemented in ipv4subnets.c */
+char *index6_id(char *ip, int bitmask);
+/* function implemented in ipv6subnets.c */
+
+char *subnet6_id(char *ip, int bitmask);
+/* function implemented in ipv6subnets.c */
+
/* ================= Let's parse configuration file here ================ */
void reject_config_and_exit(char *filename)
@@ -207,24 +224,25 @@ 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->html_color = "000000";
+ keyword->ip_count = 0;
+ keyword->leaf_discipline = "";
+ keyword->allowed_avgmtu = 0;
+
+ push(keyword, keywords);
if(!defaultkeyword)
{
- defaultkeyword=keyword;
+ defaultkeyword = keyword;
}
keywordcount++;
@@ -240,17 +258,18 @@ 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);
+ 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 ||
@@ -297,12 +316,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);
@@ -327,10 +348,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"))
@@ -373,12 +394,19 @@ void safe_run(char *cmd)
}
}
-void save_line(char *line)
+void iptables_save_line(char *line, int ipv6)
{
- fprintf(iptables_file,"%s\n",line);
+ if(ipv6)
+ {
+ fprintf(ip6tables_file,"%s\n",line);
+ }
+ else
+ {
+ fprintf(iptables_file,"%s\n",line);
+ }
}
-void run_restore(void)
+void run_iptables_restore(void)
{
char *restor;
string(restor,STRLEN);
@@ -386,8 +414,8 @@ void run_restore(void)
/*-----------------------------------------------------------------*/
printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);
/*-----------------------------------------------------------------*/
-
- save_line("COMMIT");
+
+ iptables_save_line("COMMIT", FALSE);
fclose(iptables_file);
if(dry_run)
{
@@ -400,18 +428,44 @@ void run_restore(void)
sprintf(restor,"%s <%s",iptablesrestore, iptablesfile);
safe_run(restor);
-
+
+ if(ip6prefix)
+ {
+ /*-----------------------------------------------------------------*/
+ printf("Running %s <%s ...\n", ip6tablesrestore, ip6tablesfile);
+ /*-----------------------------------------------------------------*/
+ iptables_save_line("COMMIT", TRUE);
+ fclose(ip6tables_file);
+ if(dry_run)
+ {
+ parse(ip6tablesfile)
+ {
+ printf("%s\n",_);
+ }
+ done; /* ugly macro end */
+ }
+ sprintf(restor,"%s <%s",ip6tablesrestore, ip6tablesfile);
+ safe_run(restor);
+ }
free(restor);
}
char *parse_datafile_line(char *str)
{
- char *ptr=strchr(str,' ');
+ char *ptr = strchr(str,' ');
+ if(!ptr)
+ {
+ ptr = strchr(str,'\t');
+ }
if(ptr)
{
- *ptr=0;
+ *ptr = 0;
ptr++;
+ while(*ptr == ' ' || *ptr == '\t')
+ {
+ ptr++;
+ }
return ptr;
}
else
@@ -430,13 +484,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;
@@ -446,7 +503,7 @@ program
printf("\n\
Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\
-Version %s - Copyright (C)2005-2012 Michael Polak, Arachne Labs\n\
+Version %s - Copyright (C)2005-2014 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);
@@ -459,9 +516,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; }
@@ -496,7 +557,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
if(althosts)
{
- hosts=althosts;
+ hosts = althosts;
}
if(just_flush<9)
@@ -504,30 +565,78 @@ 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, 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);
+ /*-----------------------------------------------------------------*/
+ 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 */
+
/*-----------------------------------------------------------------*/
- string(str,STRLEN);
+ 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;
+ 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)
@@ -544,7 +653,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,_))
@@ -556,6 +665,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
done; /* ugly macro end */
}
+
if(!just_preview)
{
/*-----------------------------------------------------------------*/
@@ -568,16 +678,28 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
perror(iptablesfile);
exit(-1);
}
+ iptables_save_line(iptablespreamble, FALSE);
+
+ if(ip6prefix)
+ {
+ ip6tables_file = fopen(ip6tablesfile, "w");
+ if(ip6tables_file == NULL)
+ {
+ perror(ip6tablesfile);
+ exit(-1);
+ }
+ iptables_save_line(iptablespreamble, TRUE);
+ iptables_save_line(ip6preamble, TRUE);
+ }
+
+ run_iptables_restore();
log_file = fopen(cmdlog, "w");
if(log_file == NULL)
{
perror(cmdlog);
exit(-1);
- }
-
- save_line(iptablespreamble);
- run_restore();
+ }
sprintf(str,"%s qdisc del dev %s root 2>/dev/null",tc,lan);
safe_run(str);
@@ -586,50 +708,72 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
safe_run(str);
iptables_file=fopen(iptablesfile,"w");
- save_line(iptablespreamble);
+ iptables_save_line(iptablespreamble, FALSE);
+ if(ip6prefix)
+ {
+ ip6tables_file=fopen(ip6tablesfile,"w");
+ iptables_save_line(iptablespreamble, TRUE);
+ iptables_save_line(ip6preamble, TRUE);
+ }
- if(qos_free_zone && *qos_free_zone!='0')
+ if(qos_free_zone && *qos_free_zone!='0') /* this is currently supported only for IPv4 */
{
char *chain;
sprintf(str,"-A FORWARD -d %s -o %s -j ACCEPT", qos_free_zone, wan);
- save_line(str);
+ iptables_save_line(str, FALSE); /* this is currently supported only for IPv4 */
+/*
if(qos_proxy)
{
- save_line(":post_noproxy - [0:0]");
+ iptables_save_line(":post_noproxy - [0:0]", FALSE);
sprintf(str,"-A POSTROUTING ! -p tcp -o %s -j post_noproxy", lan);
- save_line(str);
+ iptables_save_line(str , FALSE);
sprintf(str,"-A POSTROUTING ! -s %s -o %s -j post_noproxy", proxy_ip, lan);
- save_line(str);
+ 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);
- save_line(str);
+ iptables_save_line(str, FALSE);
chain="post_noproxy";
}
+
else
{
- chain="POSTROUTING";
- }
+*/
+ chain = "POSTROUTING";
+// }
sprintf(str,"-A %s -s %s -o %s -j ACCEPT", chain, qos_free_zone, lan);
- save_line(str);
+ iptables_save_line(str, FALSE);
}
if(ip_count > idxtable_treshold1 && !just_flush)
{
- int idxcount=0, bitmask=32-idxtable_bitmask1; /* default net mask: 255.255.255.240 */
+ int idxcount=0, bitmask=32-idxtable_bitmask1;
char *subnet, *buf;
/*-----------------------------------------------------------------*/
printf("Detected %d addresses - indexing iptables rules to improve performance...\n",ip_count);
/*-----------------------------------------------------------------*/
- save_line(":post_common - [0:0]");
- save_line(":forw_common - [0:0]");
+ iptables_save_line(":post_common - [0:0]", FALSE);
+ iptables_save_line(":forw_common - [0:0]", FALSE);
+ if(ip6prefix)
+ {
+ iptables_save_line(":post_common - [0:0]", TRUE);
+ iptables_save_line(":forw_common - [0:0]", TRUE);
+ }
- for_each(ip,ips) if(ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0") && !strchr(ip->addr,':')) /* only IPv4 */
+ for_each(ip,ips) if(ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0"))
{
- buf=index_id(ip->addr,bitmask);
+ if(ip->v6)
+ {
+ buf=index6_id(ip->addr,bitmask+32);
+ }
+ else
+ {
+ buf=index_id(ip->addr, bitmask);
+ }
+
if_exists(idx,idxs,eq(idx->id,buf))
{
idx->children++;
@@ -637,11 +781,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
else
{
create(idx,Index);
- idx->addr=ip->addr;
- idx->id=buf;
- idx->bitmask=bitmask;
- idx->parent=NULL;
- idx->children=0;
+ idx->addr = ip->addr;
+ idx->id = buf;
+ idx->bitmask = bitmask+32*ip->v6;
+ idx->parent = NULL;
+ idx->children = 0;
+ idx->ipv6 = ip->v6;
idxcount++;
push(idx,idxs);
}
@@ -655,7 +800,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
for_each(idx,idxs) if(idx->parent == NULL)
{
- buf = index_id(idx->addr,bitmask);
+ if(idx->ipv6)
+ {
+ buf = index6_id(idx->addr, bitmask+32);
+ }
+ else
+ {
+ buf = index_id(idx->addr, bitmask);
+ }
if_exists(metaindex,idxs,eq(metaindex->id,buf))
{
metaindex->children++;
@@ -663,11 +815,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
else
{
create(metaindex,Index);
- metaindex->addr=idx->addr;
- metaindex->id=buf;
- metaindex->bitmask=bitmask;
- metaindex->parent=NULL;
- metaindex->children=0;
+ metaindex->addr = idx->addr;
+ metaindex->id = buf;
+ metaindex->bitmask = bitmask+32*idx->ipv6;
+ metaindex->parent = NULL;
+ metaindex->children = 0;
+ metaindex->ipv6 = idx->ipv6;
idxcount++;
push(metaindex,idxs);
}
@@ -682,20 +835,26 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
i=0;
for_each(idx,idxs)
{
- subnet=subnet_id(idx->addr,idx->bitmask);
- printf("%d: %s/%d\n",
- ++i, subnet, idx->bitmask);
+ if(idx->ipv6)
+ {
+ subnet=subnet6_id(idx->addr, idx->bitmask);
+ }
+ else
+ {
+ subnet=subnet_id(idx->addr, idx->bitmask);
+ }
+ printf("%d: %s/%d\n", ++i, subnet, idx->bitmask);
sprintf(str,":post_%s - [0:0]", idx->id);
- save_line(str);
+ iptables_save_line(str, idx->ipv6);
sprintf(str,":forw_%s - [0:0]", idx->id);
- save_line(str);
+ iptables_save_line(str, idx->ipv6);
if(idx->parent)
{
string(buf,strlen(idx->parent->id)+6);
- sprintf(buf,"post_%s",idx->parent->id);
+ sprintf(buf,"post_%s", idx->parent->id);
}
else
{
@@ -703,10 +862,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
}
sprintf(str,"-A %s -d %s/%d -o %s -j post_%s", buf, subnet, idx->bitmask, lan, idx->id);
- save_line(str);
+ iptables_save_line(str, idx->ipv6);
sprintf(str,"-A %s -d %s/%d -o %s -j post_common", buf, subnet, idx->bitmask, lan);
- save_line(str);
+ iptables_save_line(str, idx->ipv6);
if(idx->parent)
{
@@ -719,20 +878,28 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
}
sprintf(str,"-A %s -s %s/%d -o %s -j forw_%s", buf, subnet, idx->bitmask, wan, idx->id);
- save_line(str);
+ iptables_save_line(str, idx->ipv6);
sprintf(str,"-A %s -s %s/%d -o %s -j forw_common", buf, subnet, idx->bitmask, wan);
- save_line(str);
+ 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);
- save_line(str);
+ iptables_save_line(str, FALSE);
sprintf(str,"-A POSTROUTING -o %s -j post_common", lan);
- save_line(str);
+ iptables_save_line(str, FALSE);
+
+ if(ip6prefix)
+ {
+ 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);
+ }
}
-
}
if(just_flush)
@@ -849,8 +1016,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.... */
+ if(ip->max < ip->desired || stop_shaping || reduce_ceil) /* apply or disable FUP limit immediately.... */
{
- printf("Applying limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark);
+ if(stop_shaping)
+ {
+ ip->max = ip->desired;
+ printf("Removing limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark);
+ }
+ else
+ {
+ printf("Applying limit for %-22s %-16s %04d ", ip->name, ip->addr, ip->mark);
+ if(reduce_ceil)
+ {
+ ip->max = ip->min + (ip->desired-ip->min)/reduce_ceil;
+ }
+ }
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);
@@ -917,6 +1095,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 */
}
@@ -930,12 +1109,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
printf("Writing json traffic overview %s ... ", json_traffic);
/*-----------------------------------------------------------------*/
write_json_traffic(json_traffic);
- }
- /*-----------------------------------------------------------------*/
- printf("Writing statistics into HTML page %s ...\n", html);
- /*-----------------------------------------------------------------*/
- write_htmlandlogs(html, d,total, just_preview);
+ /*-----------------------------------------------------------------*/
+ printf("Writing statistics into HTML page %s ...\n", html);
+ /*-----------------------------------------------------------------*/
+ write_htmlandlogs(html, d, total, just_preview);
+ }
if(just_preview)
{
@@ -944,6 +1123,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);
}
@@ -953,7 +1141,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)
{
@@ -961,16 +1149,23 @@ 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 && !strchr(ip->addr,':')) /* works only for IPv4 so far */
+ for_each(ip, ips) if(ip->mark > 0) /* works only for IPv4 so far */
{
if(idxs)
{
char *buf;
duplicate(ip->addr,buf);
- buf=index_id(ip->addr,32-idxtable_bitmask1);
+ if(ip->v6)
+ {
+ buf=index6_id(ip->addr,64-idxtable_bitmask1);
+ }
+ else
+ {
+ buf=index_id(ip->addr,32-idxtable_bitmask1);
+ }
string(chain_forward,6+strlen(buf));
strcpy(chain_forward,"forw_");
@@ -988,39 +1183,67 @@ 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 */
-
- sprintf(str, "-A %s -d %s/32 -o %s -j %s%d",
- chain_postrouting, ip->addr, lan, mark_iptables, ip->mark);
- /*sprintf(str,"-A %s -d %s/32 -o %s -j MARK --set-mark %d",chain_postrouting,ip->addr,lan,ip->mark);*/
- /* -m limit --limit 1/s */
- save_line(str);
+ /* -------------------------------------------------------- mark download */
+ sprintf(str, "-A %s -d %s/%d -o %s -j %s%d",
+ 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/32 -o %s -j %s%d",
- chain_postrouting, proxy_ip, proxy_port, ip->addr, lan, mark_iptables, ip->mark);
- /*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);*/
- save_line(str);
+ 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,
+ 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/32 -o %s -j ACCEPT",
- chain_postrouting, ip->addr, lan);
- save_line(str);
+ sprintf(str, "-A %s -d %s/%d -o %s -j ACCEPT",
+ chain_postrouting, ip->addr, ip->mask, lan);
+ iptables_save_line(str, ip->v6);
/* -------------------------------------------------------- mark upload */
- sprintf(str, "-A %s -s %s/32 -o %s -j %s%d",
- chain_forward, ip->addr, wan, mark_iptables, ip->mark);
- /* sprintf(str,"-A %s -s %s/32 -o %s -j MARK --set-mark %d",chain_forward,ip->addr,wan,ip->mark);*/
- save_line(str);
+ sprintf(str, "-A %s -s %s/%d -o %s -j %s%d",
+ 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);
- sprintf(str, "-A %s -s %s/32 -o %s -j ACCEPT",
- chain_forward, ip->addr, wan);
- save_line(str);
+ /* 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, ip->mask, wan);
+ iptables_save_line(str, ip->v6);
if(ip->min)
{
@@ -1030,21 +1253,21 @@ 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"))
{
- 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);
+ 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);
}
if(filter_type == 1)
{
- 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);
+ 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 */
@@ -1061,21 +1284,21 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
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);
+ 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);
}
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);
- safe_run(str);
+ sprintf(str, "%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d",
+ tc, wan, ip->mark, ip->mark);
+ safe_run(str);
}
if(f > 0)
{
- fprintf(f, "%s %d\n", ip->addr, ip->mark);
+ fprintf(f, "%s %d\n", ip->addr, ip->mark);
}
}
else
@@ -1094,79 +1317,103 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
if(idxs)
{
- chain_forward = "forw_common";
- chain_postrouting = "post_common";
+ chain_forward = "forw_common";
+ chain_postrouting = "post_common";
}
else
{
- chain_forward = "FORWARD";
- chain_postrouting = "POSTROUTING";
+ chain_forward = "FORWARD";
+ chain_postrouting = "POSTROUTING";
}
- /* -------------------------------- classify or reject free download */
+
+ if(free_min)
{
- char *final_chain = "DROP"; /* REJECT would be better, but it is impossible in mangle */
- if(free_min)
- {
- 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);
- save_line(str);
- }
- sprintf(str,"-A %s -s %s -p tcp --sport %d -o %s -j %s",
- chain_postrouting,proxy_ip,proxy_port,lan,final_chain);
- save_line(str);
- }
- if(free_min)
- {
- sprintf(str,"-A %s -o %s -j %s%d", chain_postrouting, lan, mark_iptables, 3);
- save_line(str);
- }
- sprintf(str,"-A %s -o %s -j %s", chain_postrouting, lan, final_chain);
- save_line(str);
- /* ------------------------------- classify or reject free upload */
- if(free_min)
- {
- sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, 3);
- save_line(str);
- }
- sprintf(str,"-A %s -o %s -j %s", chain_forward, wan, final_chain);
- save_line(str);
+ 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
+ }
+ 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, FREE_CLASS);
+ 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)
+ {
+ sprintf(str,"-A %s -o %s -j %s%d", chain_forward, wan, mark_iptables, FREE_CLASS);
+ iptables_save_line(str, FALSE); /* 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);
}
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 3 fw flowid 1:3", tc, wan);
+ 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);
+
+ /*-----------------------------------------------------------------*/
+ 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);
- run_restore();
+ run_iptables_restore();
if(log_file)
{
fclose(log_file);