~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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
29911b0
..
a9be668
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):