Merge branches 'mdw/knock' and 'mdw/ipv6' into bleeding

[tripe] / py / tripe.py.in

diff --git a/py/tripe.py.in b/py/tripe.py.in
index 5562d7b30b50c0b26d158bf9134d09b2783282e0..a9be66872cfbbc0b1e4223272238db4cbef9719c 100644 (file)
--- a/py/tripe.py.in
+++ b/py/tripe.py.in
@@ -838,7 +838,8 @@ class TripeCommandDispatcher (TripeConnection):
                               *['ADD'] +
                               _kwopts(kw, ['tunnel', 'keepalive',
                                            'key', 'priv', 'cork',
-                                           'mobile']) +
+                                           'mobile', 'knock',
+                                           'ephemeral']) +
                               [peer] +
                               list(addr)))
   def addr(me, peer):
@@ -878,8 +879,10 @@ class TripeCommandDispatcher (TripeConnection):
                                *['PING'] +
                                _kwopts(kw, ['timeout']) +
                                [peer]))
-  def port(me):
-    return _oneline(me.command('PORT', filter = _tokenjoin))
+  def port(me, af = None):
+    return _oneline(me.command('PORT',
+                               *((af is not None) and [af] or []),
+                               filter = _tokenjoin))
   def quit(me):
     return _simple(me.command('QUIT'))
   def reload(me):