almost new release (some aggregation related stuff and more)

[svn/Prometheus-QoS/.git] / ipstruct.h

diff --git a/ipstruct.h b/ipstruct.h
index 797fb7bb72bca3bcd2f0f64157c1ffc08d9f1c11..d4383b32fc4192e98ce6d18f01dd2976e966b680 100644 (file)
--- a/ipstruct.h
+++ b/ipstruct.h
@@ -42,7 +42,7 @@ struct Keyword
 {\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
@@ -53,6 +53,8 @@ struct Keyword
 // 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