From 6e8bbeebe6656d1f6fda14ae8c3aebf3c119b3fd Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Thu, 28 Sep 2017 19:20:35 +0100 Subject: [PATCH] svc/conntrack.in: Gather address hacking functions into a new section. --- svc/conntrack.in | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/svc/conntrack.in b/svc/conntrack.in index 061d6d76..ef042f78 100644 --- a/svc/conntrack.in +++ b/svc/conntrack.in @@ -94,9 +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 '#' 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. @@ -197,12 +206,6 @@ class Config (object): ### This will be a configuration file. CF = None -def straddr(a): return a is None and '#' 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(): -- 2.11.0