{\r
char *key;\r
\r
- int asymetry_ratio; /* ratio for ADSL-like upload */\r
+ float asymetry_ratio; /* ratio for ADSL-like upload */\r
int asymetry_fixed; /* fixed treshold for ADSL-like upload */\r
int data_limit; /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */\r
int data_prio; /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */\r
// int divide_max; /* relative malus: new_ceil=rate+(old_ceil-rate)/divide_max */\r
// int htb_ceil_bonus_divide; /* relative bonus: new_ceil=old_ceil+old_ceil/htb_ceil_bonus_divide */\r
int default_prio; /* default HTB priority for this keyword */\r
+ int download_aggregation; /* apply agregation with -s start_shaping switch */\r
+ int upload_aggregation; /* apply agregation with -s start_shaping switch */\r
char *html_color;\r
int ip_count;\r
char *leaf_discipline;\r
list(Keyword);\r
};\r
\r
+struct Macro\r
+{\r
+ char *rewrite_from;\r
+ char *rewrite_to;\r
+ list(Macro);\r
+};\r
+\r
void TheIP(char *ipaddr, int is_network);\r
/* function implemented in parsehosts.c */\r