chiark / gitweb /
svc/conntrack.in (straddr): Handle `None' as a packed address.
authorMark Wooding <mdw@distorted.org.uk>
Sat, 24 May 2014 13:00:03 +0000 (14:00 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 20 Jul 2014 00:42:31 +0000 (01:42 +0100)
svc/conntrack.in

index f4b717bc2ec3a8a8e276fb100e0c359f95123df8..0fab16ef4f2c2162cfde1f494cca46bd70a10d34 100644 (file)
@@ -195,7 +195,7 @@ class Config (object):
 ### This will be a configuration file.
 CF = None
 
-def straddr(a): return S.inet_ntoa(pack('>L', a))
+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 i