X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=ipstruct.h;h=f8d09e5501fabc6521e20510e698ab9e96fcdee7;hb=3430e838dc632523c571a995d75ace44de1b06b6;hp=797fb7bb72bca3bcd2f0f64157c1ffc08d9f1c11;hpb=bb5e73853e892f8bce70e03344a81b192c2b84ff;p=svn%2FPrometheus-QoS%2F.git

diff --git a/ipstruct.h b/ipstruct.h
index 797fb7b..f8d09e5 100644
--- a/ipstruct.h
+++ b/ipstruct.h
@@ -10,12 +10,15 @@ struct IP
  int max;
  int mark;
  int prio;
+ int aggregated;
  int fixedprio;
  int group;
  int lmsid;
  int pps_limit;
  unsigned long long direct;
  unsigned long long proxy;
+ unsigned long long traffic_down;
+ unsigned long long traffic_up;
  unsigned long long upload;
  unsigned long long traffic;
  unsigned long long credit;
@@ -42,7 +45,7 @@ struct Keyword
 {
  char *key;
  
- int asymetry_ratio;        /* ratio for ADSL-like upload */
+ float asymetry_ratio;      /* ratio for ADSL-like upload */
  int asymetry_fixed;        /* fixed treshold for ADSL-like upload */
  int data_limit;            /* hard shaping: apply magic_treshold if max*data_limit MB exceeded */
  int data_prio;             /* soft shaping (qos): reduce HTB prio if max*data_prio MB exceeded */
@@ -53,6 +56,8 @@ struct Keyword
 // int divide_max;	    /* relative malus: new_ceil=rate+(old_ceil-rate)/divide_max */
 // int htb_ceil_bonus_divide; /* relative bonus: new_ceil=old_ceil+old_ceil/htb_ceil_bonus_divide */
  int default_prio;	    /* default HTB priority for this keyword */
+ int download_aggregation;  /* apply agregation with -s start_shaping switch */
+ int upload_aggregation;    /* apply agregation with -s start_shaping switch */
  char *html_color;
  int ip_count;
  char *leaf_discipline;
@@ -67,5 +72,40 @@ struct Macro
  list(Macro);
 };
 
+struct QosFreeInterface
+{
+ char *name;
+ int _eoln;
+ list(QosFreeInterface);
+};
+
+struct Textfile
+{
+ char *str;
+ int _eoln;
+ list(Textfile);
+};
+
+struct Index
+{
+ char *addr;
+ char *id;
+ struct Index *parent;
+ int bitmask;
+ int children;
+ int ipv6;
+ list(Index);
+};
+
+struct Interface 
+{
+ char *name;
+ long long speed;
+ int is_upstream;
+ char *chain;
+ char *idxprefix;
+ list(Interface);
+};
+
 void TheIP(char *ipaddr, int is_network);
 /* function implemented in parsehosts.c */