From b7c1665d8683c76af494214037e1fe8869c22432 Mon Sep 17 00:00:00 2001
Message-Id: <b7c1665d8683c76af494214037e1fe8869c22432.1714495559.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Thu, 28 Sep 2017 19:12:54 +0100
Subject: [PATCH] svc/conntrack.in (strmask): Consistently return a string
 object.
Organization: Straylight/Edgeware

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

Inexplicably, this used to return an integer if the mask covered a
prefix.  Fortunately, it was always invoked in order to produce a thing
which is printed via `%s', which stringifies anyway.
---
 svc/conntrack.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/svc/conntrack.in b/svc/conntrack.in
index 1b9f5819..a55e4c32 100644
--- a/svc/conntrack.in
+++ b/svc/conntrack.in
@@ -197,7 +197,7 @@ 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 i
+    if m == 0xffffffff ^ ((1 << (32 - i)) - 1): return str(i)
   return straddr(m)
 
 def cmd_showconfig():
-- 
[mdw]