version 1.0.0.-a - significat iptables parsing speed improvement

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

diff --git a/ipstruct.h b/ipstruct.h
index 6f0e5694dc2aab8b15174b4c7ad8b59992964a45..3b807474df260cd6cd79edaec83591d959718c00 100644 (file)
--- a/ipstruct.h
+++ b/ipstruct.h
@@ -1,4 +1,6 @@
-/* Modified by: xChaos, 20131029 */\r
+/* Modified by: xChaos, 20200104 */\r
+\r
+#define MONITORINGTRHU_CTU\r
 \r
 struct IP\r
 {\r
@@ -10,12 +12,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
@@ -23,6 +28,10 @@ struct IP
  unsigned long pktsup;\r
  unsigned long pktsdown;\r
  struct Keyword *keyword;\r
+#ifdef MONITORINGTRHU_CTU\r
+ char *technology_str;\r
+ char *ruian_id_str;\r
+#endif\r
  int v6;\r
  int mask;\r
  struct IP *uplink;\r
@@ -53,6 +62,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 +78,43 @@ struct Macro
  list(Macro);\r
 };\r
 \r
+struct QosFreeInterface\r
+{\r
+ char *name;\r
+ int _eoln;\r
+ list(QosFreeInterface);\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
+\r
+#ifdef MONITORINGTRHU_CTU\r
+struct Technology\r
+{\r
+ char *filename;\r
+ list(Technology);\r
+};\r
+\r
+extern struct Technology *technologies, *technology;\r
+#endif\r