~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mdw/multi-priv'
[tripe]
/
py
/
tripe.py.in
diff --git
a/py/tripe.py.in
b/py/tripe.py.in
index
cefb667
..
c2b430b
100644
(file)
--- a/
py/tripe.py.in
+++ b/
py/tripe.py.in
@@
-831,13
+831,15
@@
class TripeCommandDispatcher (TripeConnection):
return _simple(me.command(bg = True,
*['ADD'] +
_kwopts(kw, ['tunnel', 'keepalive',
return _simple(me.command(bg = True,
*['ADD'] +
_kwopts(kw, ['tunnel', 'keepalive',
- 'key', 'cork', 'mobile']) +
+ 'key', 'priv', 'cork',
+ 'mobile']) +
[peer] +
list(addr)))
def addr(me, peer):
return _oneline(me.command('ADDR', peer))
[peer] +
list(addr)))
def addr(me, peer):
return _oneline(me.command('ADDR', peer))
- def algs(me):
- return _keyvals(me.command('ALGS'))
+ def algs(me, peer = None):
+ return _keyvals(me.command('ALGS',
+ *((peer is not None and [peer]) or [])))
def checkchal(me, chal):
return _simple(me.command('CHECKCHAL', chal))
def daemon(me):
def checkchal(me, chal):
return _simple(me.command('CHECKCHAL', chal))
def daemon(me):