more work on aggregation

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

diff --git a/ipstruct.h b/ipstruct.h
index 6f0e5694dc2aab8b15174b4c7ad8b59992964a45..542cb0aa7c7a16ecca6c841481d971565b7c5fe0 100644 (file)
--- a/ipstruct.h
+++ b/ipstruct.h
@@ -10,12 +10,15 @@ struct IP
  int max;\r
  int mark;\r
  int prio;\r
+ int aggregated;\r
  int fixedprio;\r
  int group;\r
  int lmsid;\r
  int pps_limit;\r
  unsigned long long direct;\r
  unsigned long long proxy;\r
+ unsigned long long traffic_down;\r
+ unsigned long long traffic_up;\r
  unsigned long long upload;\r
  unsigned long long traffic;\r
  unsigned long long credit;\r
@@ -53,6 +56,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