Changeset 7936 in genesis

Timestamp:

May 18, 2010, 6:33:07 PM (15 years ago)

Author:

lodewijk

Message:

herschrijf het zoeken naar IP adressen. ipv de uitvoer van grep pakken, ga
zelf over */wleiden.conf's heen. hou variabelen bij, en handel vervolgens
references naar die variabelen af als er een "IP=" voorbij komt.

File:

• nodes/getrange.py (modified) (3 diffs)

nodes/getrange.py

@@ -6 +6 @@
 import re
 import sys
+import glob
 
 size = 30
@@ -16 +17 @@
 numaddrs = 1 << (32 - size)
 
-ipre = re.compile("^IP=(172\.16\.[0-9]+\.[0-9]+)/([0-9]+) *")
+substre = re.compile("^(\$[a-zA-Z][^ =]*) ?= ?'([^']*)';")
 
 def parseaddr(s):
@@ -30 +31 @@
 bezet = {}
 
-(cout, cin) = popen2.popen2("cat */wleiden.conf | grep ^IP | grep 172.16\...*\/[24\|26\|28\|29\|30]")
-cin.close()
-for l in cout.readlines():
-        l = l[:-1]
-        match = ipre.match(l)
-        if match == None:
-                #print "'" + l + "'"
-                continue
-        if len(match.groups()) == 0:
-                continue
-        addr = parseaddr(match.group(1))
-        mask = int(match.group(2))
-        addr = addr & ~((1 << (32 - mask)) - 1)
-        bezet[addr] = 1
+for fname in glob.glob("*/wleiden.conf"):
+        substs = {}
+        for l in open(fname):
+                l = l[:-1]
+                match = substre.match(l)
+                if match != None:
+                        substs[match.group(1)] = match.group(2)
+                if l.startswith("IP="):
+                        right = l[3:]
+                        if '/' not in right:
+                                addr = right
+                                mask = 32
+                        else:
+                                addr, mask = right.split('/')
+                                if addr in substs:
+                                        addr = substs[addr]
+                        addr = parseaddr(addr)
+                        mask = int(mask)
+                        addr = addr & ~((1 << (32 - mask)) - 1)
+                        bezet[addr] = 1
 
 i = 0xffffffffL