IPv6 support: step 1. prometheus.conf + hosts parsing

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

diff --git a/parsehosts.c b/parsehosts.c
index db3bf2eb52f2003c647518487023cceb98d9d118..528f376ce38fa5333bb6305d3d15c5db47021451 100644 (file)
--- a/parsehosts.c
+++ b/parsehosts.c
@@ -15,13 +15,14 @@ extern int ip_count;
 extern int found_lmsid;\r
 extern int free_min;\r
 extern const int highest_priority;\r
+extern char *ip6prefix;\r
 \r
 /* This must be object oriented! This looks almost like constructor ;-) */\r
-void TheIP(void)\r
+void TheIP(char *ipaddr)\r
 {\r
  create(ip,IP);\r
  ip->name        = "";\r
- ip->addr        = "";\r
+ ip->addr        = ipaddr;\r
  ip->sharing     = NULL;\r
  ip->prio        = highest_priority+1;\r
  ip->lmsid       = -1;\r
@@ -44,7 +45,22 @@ void TheIP(void)
 /* == This function strips extra characters after IPv4 address and stores it = */\r
 void parse_ip(char *str)\r
 {\r
- char *ptr, *ipaddr = NULL, *ipname = NULL, *lmsid = NULL;\r
+ char *ptr, *ipaddr, *ip6range = NULL, *ipname = NULL, *lmsid = NULL;\r
+\r
+ if(ip6prefix) /* Try this only if IPv6 subsystem is active...*/\r
+ {\r
+  ptr = strstr(str, "::");\r
+  if(ptr && ptr-str > 4)\r
+  {\r
+   ptr -= 4;   \r
+   duplicate(ptr,ip6range);\r
+   ptr = strstr(ip6range, "::");\r
+   if(ptr)\r
+   {\r
+    *(ptr+2) = 0;\r
+   }\r
+  }\r
+ }\r
 \r
  ptr = strchr(str, '{');\r
  if(ptr)\r
@@ -77,12 +93,28 @@ void parse_ip(char *str)
  }\r
  *ptr=0;\r
 \r
+ if(ip6range)\r
+ {\r
+  concatenate(ip6prefix,ip6range,ptr);\r
+  concatenate(ptr,"/64",ip6range);\r
+  if_exists(ip, ips, eq(ip->addr,ip6range));\r
+  else\r
+  {\r
+   TheIP(ip6range);\r
+  }\r
+  ip->name = ptr;\r
+  ip->sharing = ipname;\r
+  if(lmsid)\r
+  {\r
+   ip->lmsid = atoi(lmsid);\r
+  }\r
+ }\r
+\r
  if_exists(ip, ips, eq(ip->addr,ipaddr));\r
  else\r
  {\r
-  TheIP();\r
+  TheIP(ipaddr);\r
  }\r
- ip->addr = ipaddr;\r
  ip->name = ipname;\r
  if(lmsid)\r
  {\r