svc/connect.in (addpeer): Use `boolean' filter rather than a local hack.

[tripe] / svc / connect.in

diff --git a/svc/connect.in b/svc/connect.in
index 7a9357237c1149822d9d8cb850055952c596119f..b6ec4b8ca7ef09a07573df94ed82bd2932fcca2e 100644 (file)
--- 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)