From a5dbeffaa04264432f376782053152dd97c7065b Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Mon, 11 Jun 2018 13:02:03 +0100 Subject: [PATCH] svc/connect.in (addpeer): Use `boolean' filter rather than a local hack. Organization: Straylight/Edgeware From: Mark Wooding Now that `Peer.get' actually works properly, this is safe. --- svc/connect.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/svc/connect.in b/svc/connect.in index 7a935723..b6ec4b8c 100644 --- a/svc/connect.in +++ b/svc/connect.in @@ -725,14 +725,13 @@ def addpeer(peer, addr): if peer.name in S.list(): S.kill(peer.name) try: - booltrue = ['t', 'true', 'y', 'yes', 'on'] S.add(peer.name, - tunnel = peer.get('tunnel', None), - keepalive = peer.get('keepalive', None), - key = peer.get('key', None), - priv = peer.get('priv', None), - mobile = peer.get('mobile', 'nil') in booltrue, - cork = peer.get('cork', 'nil') in booltrue, + tunnel = peer.get('tunnel', default = None), + keepalive = peer.get('keepalive', default = None), + key = peer.get('key', default = None), + priv = peer.get('priv', default = None), + mobile = peer.get('mobile', filter = boolean, default = False), + cork = peer.get('cork', filter = boolean, default = False), *addr) except T.TripeError, exc: raise T.TripeJobError(*exc.args) -- [mdw]