debug version

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

diff --git a/ipstruct.h b/ipstruct.h
index 797fb7bb72bca3bcd2f0f64157c1ffc08d9f1c11..f8d09e5501fabc6521e20510e698ab9e96fcdee7 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
@@ -42,7 +45,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 +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
@@ -67,5 +72,40 @@ struct Macro
  list(Macro);\r
 };\r
 \r
+struct QosFreeInterface\r
+{\r
+ char *name;\r
+ int _eoln;\r
+ list(QosFreeInterface);\r
+};\r
+\r
+struct Textfile\r
+{\r
+ char *str;\r
+ int _eoln;\r
+ list(Textfile);\r
+};\r
+\r
+struct Index\r
+{\r
+ char *addr;\r
+ char *id;\r
+ struct Index *parent;\r
+ int bitmask;\r
+ int children;\r
+ int ipv6;\r
+ list(Index);\r
+};\r
+\r
+struct Interface \r
+{\r
+ char *name;\r
+ long long speed;\r
+ int is_upstream;\r
+ char *chain;\r
+ char *idxprefix;\r
+ list(Interface);\r
+};\r
+\r
 void TheIP(char *ipaddr, int is_network);\r
 /* function implemented in parsehosts.c */\r