Skip to content

S
sshuttle
Commit d80b590a authored by shaiay's avatar shaiay Committed by Brian May
Browse files
Options

Fix joining of seed hosts to be compatible with python 3.5 

this should also be backwards compatible with python 2
parent 7f0b5c69
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sshuttle/client.py
View file @ d80b590a
...@@ -487,7 +487,7 @@ def _main(tcp_listener, udp_listener, fw, ssh_cmd, remotename, ...@@ -487,7 +487,7 @@ def _main(tcp_listener, udp_listener, fw, ssh_cmd, remotename,
if seed_hosts is not None: if seed_hosts is not None:
debug1('seed_hosts: %r\n' % seed_hosts) debug1('seed_hosts: %r\n' % seed_hosts)
mux.send(0, ssnet.CMD_HOST_REQ, b'\n'.join(seed_hosts)) mux.send(0, ssnet.CMD_HOST_REQ, str.encode('\n'.join(seed_hosts)))
while 1: while 1:
rv = serverproc.poll() rv = serverproc.poll()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment