From c3897a7de7a53dab3f96fb224fa90dd35fa56dc1 Mon Sep 17 00:00:00 2001
Message-Id: <c3897a7de7a53dab3f96fb224fa90dd35fa56dc1.1715447560.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sat, 24 May 2014 14:00:03 +0100
Subject: [PATCH] svc/conntrack.in (straddr): Handle `None' as a packed
 address.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

---
 svc/conntrack.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/svc/conntrack.in b/svc/conntrack.in
index f4b717bc..0fab16ef 100644
--- a/svc/conntrack.in
+++ b/svc/conntrack.in
@@ -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
-- 
[mdw]