prometheus.conf upgrade

[svn/Prometheus-QoS/.git] / parsehosts.c

diff --git a/parsehosts.c b/parsehosts.c
index 04fce9ffca9714d2fbfbc474f49d91211477d154..9ee2c2b003995e59c746cbe7789dd563f553817a 100644 (file)
--- a/parsehosts.c
+++ b/parsehosts.c
@@ -1,4 +1,4 @@
-/* Modified by: xChaos, 20131028 */\r
+/* Modified by: xChaos, 20131029 */\r
 \r
 #include "cll1-0.6.2.h"\r
 #include "ipstruct.h"\r
@@ -17,7 +17,7 @@ extern int free_min;
 extern const int highest_priority;\r
 extern char *ip6prefix;\r
 \r
-struct IP* find_network_for_ip(char *ipaddr_orig);\r
+void update_network(char *look_for, struct IP* ip);\r
 /* implemented in networks.c */\r
 \r
 /* This must be object oriented! This looks almost like constructor ;-) */\r
@@ -40,6 +40,7 @@ void TheIP(char *ipaddr, int is_network)
  ip->direct      = \\r
  ip->traffic     = \\r
  ip->pktsup      = \\r
+ ip->pps_limit   = \\r
  ip->pktsdown    = 0;\r
  ip->keyword     = keywords;\r
  ip->v6          = (strchr(ip->addr,':')!=NULL);\r
@@ -150,6 +151,7 @@ void parse_hosts(char *hosts)
  char *str, *ptr;\r
  char *substring;\r
  struct IP *network;\r
+ int pktratio;\r
 \r
  parse(hosts)\r
  {\r
@@ -235,6 +237,7 @@ void parse_hosts(char *hosts)
       *ptr=0;\r
       ip->max = ip->desired = atoi(ptr+1);\r
      }\r
+\r
      ip->min = atoi(substring);\r
      if(ip->min <= 0)\r
      {\r
@@ -242,6 +245,7 @@ void parse_hosts(char *hosts)
              str, free_min);\r
       ip->min = free_min;\r
      }\r
+\r
      if(ip->max <= ip->min)\r
      {\r
       ip->fixedprio = TRUE;\r
@@ -250,24 +254,26 @@ void parse_hosts(char *hosts)
      else \r
      {\r
       ip->max -= ip->keyword->reserve_max;\r
-      if(ip->max<ip->min)\r
+      if(ip->max < ip->min)\r
       {\r
-       ip->max=ip->min;\r
+       ip->max = ip->min;\r
       }\r
      }\r
-     ip->mark = FIRSTIPCLASS+1+class_count++;\r
 \r
-     network = find_network_for_ip(ip->addr);\r
-     if(network)\r
+     /* avg MTU bytes * 8 >> 10 = in bits, max is in kb/s  */\r
+     pktratio = (ip->keyword->allowed_avgmtu*8) >> 10;\r
+     if(pktratio > 0)\r
      {\r
-      network->min += ip->min;\r
-      network->desired += ip->max;\r
-      if(ip->max > network->max)\r
+      ip->pps_limit = ip->max/pktratio;\r
+      if(ip->pps_limit > 10000) /* this limit seems to be hardcoded in iptables */\r
       {\r
-       network->max = ip->max;\r
+       ip->pps_limit = 0; /* do not apply packet limits */\r
       }\r
      }\r
 \r
+     ip->mark = FIRSTIPCLASS+1+class_count++;     \r
+     update_network(ip->addr, ip);\r
+\r
      if_exists(group,groups,(group->min == ip->min)) \r
      { \r
       group->count++;      \r
@@ -300,4 +306,7 @@ void parse_hosts(char *hosts)
   exit(-1);\r
  }\r
  done; /* ugly macro end */\r
+// TheIP("0.0.0.0", TRUE);\r
+// ip->name = "TOTAL";\r
+// ip->mask = 0;\r
 }
\ No newline at end of file