svc/conntrack.in: Gather address hacking functions into a new section.

[tripe] / svc / conntrack.in

diff --git a/svc/conntrack.in b/svc/conntrack.in
index a55e4c3219c62c195b6e056d581c98c45563c43f..ef042f78b54cd6d457152f48e5a9eb30a2c50db9 100644 (file)
--- a/svc/conntrack.in
+++ b/svc/conntrack.in
@@ -94,6 +94,18 @@ def toposort(cmp, things):
     if done:
       break
 
+###--------------------------------------------------------------------------
+### Address manipulation.
+
+def parse_address(addrstr):
+  return unpack('>L', S.inet_aton(addrstr))[0]
+
+def straddr(a): return a is None and '#<none>' or S.inet_ntoa(pack('>L', a))
+def strmask(m):
+  for i in xrange(33):
+    if m == 0xffffffff ^ ((1 << (32 - i)) - 1): return str(i)
+  return straddr(m)
+
 ###--------------------------------------------------------------------------
 ### Parse the configuration file.
 
@@ -170,12 +182,12 @@ class Config (object):
         ## and MASK is either a dotted-quad or a single integer N indicating
         ## a mask with N leading ones followed by trailing zeroes.
         slash = net.index('/')
-        addr, = unpack('>L', S.inet_aton(net[:slash]))
+        addr = parse_address(net[:slash])
         if net[slash + 1:].isdigit():
           n = int(net[slash + 1:], 10)
           mask = (1 << 32) - (1 << 32 - n)
         else:
-          mask, = unpack('>L', S.inet_aton(net[slash + 1:]))
+          mask = parse_address(net[slash + 1:])
         pats.append((tag, peer, addr & mask, mask))
 
       ## Annoyingly, RawConfigParser doesn't preserve the order of options.
@@ -194,12 +206,6 @@ class Config (object):
 ### This will be a configuration file.
 CF = None
 
-def straddr(a): return a is None and '#<none>' or S.inet_ntoa(pack('>L', a))
-def strmask(m):
-  for i in xrange(33):
-    if m == 0xffffffff ^ ((1 << (32 - i)) - 1): return str(i)
-  return straddr(m)
-
 def cmd_showconfig():
   T.svcinfo('test-addr=%s' % CF.testaddr)
 def cmd_showgroups():
@@ -229,7 +235,7 @@ def localaddr(peer):
     try:
       sk.connect((peer, 1))
       addr, _ = sk.getsockname()
-      addr, = unpack('>L', S.inet_aton(addr))
+      addr = parse_address(addr)
       return addr
     except S.error:
       return None