almost new release (some aggregation related stuff and more)

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

diff --git a/ipstruct.h b/ipstruct.h
index dab37fcbe97f486109ee942559af9b44c62a444c..d4383b32fc4192e98ce6d18f01dd2976e966b680 100644 (file)
--- a/ipstruct.h
+++ b/ipstruct.h
@@ -1,3 +1,5 @@
+/* Modified by: xChaos, 20131029 */\r
+\r
 struct IP\r
 {\r
  char *addr;\r
@@ -11,6 +13,7 @@ struct IP
  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 upload;\r
@@ -20,6 +23,9 @@ struct IP
  unsigned long pktsup;\r
  unsigned long pktsdown;\r
  struct Keyword *keyword;\r
+ int v6;\r
+ int mask;\r
+ struct IP *uplink;\r
  list(IP);\r
 };\r
 \r
@@ -36,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
@@ -47,12 +53,21 @@ 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
- \r
+ int allowed_avgmtu;        /* this is for calculating packet limits, 0 = no limit*/ \r
  list(Keyword);\r
 };\r
 \r
-void TheIP(char *ipaddr);\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