open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transit: fix py3

Browse Source
This commit is contained in:
Brian Warner 2015-12-03 16:23:12 -06:00
parent 95d0e68cf2
commit 229c702ccc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wormhole/blocking/transit.py
View File

@ -70,11 +70,12 @@ def send_to(skt, data):
sent += skt.send(data[sent:]) sent += skt.send(data[sent:])
def wait_for(skt, expected, description): def wait_for(skt, expected, description):
assert isinstance(expected, type(b""))
got = b"" got = b""
while len(got) < len(expected): while len(got) < len(expected):
got += skt.recv(1) got += skt.recv(1)
if expected[:len(got)] != got: if expected[:len(got)] != got:
raise BadHandshake("got '%r' want '%r' on %s" % raise BadHandshake("got %r want %r on %s" %
(got, expected, description)) (got, expected, description))
# The hint format is: TYPE,VALUE= /^([a-zA-Z0-9]+):(.*)$/ . VALUE depends # The hint format is: TYPE,VALUE= /^([a-zA-Z0-9]+):(.*)$/ . VALUE depends
@ -130,13 +131,13 @@ def connector(owner, hint, description,
if relay_handshake: if relay_handshake:
debug(" - sending relay_handshake") debug(" - sending relay_handshake")
send_to(skt, relay_handshake) send_to(skt, relay_handshake)
wait_for(skt, "ok\n", description) wait_for(skt, b"ok\n", description)
debug(" - relay ready CT+%.1f" % (since(start),)) debug(" - relay ready CT+%.1f" % (since(start),))
send_to(skt, send_handshake) send_to(skt, send_handshake)
wait_for(skt, expected_handshake, description) wait_for(skt, expected_handshake, description)
debug(" + connector(%s) ready CT+%.1f" % (hint, since(start))) debug(" + connector(%s) ready CT+%.1f" % (hint, since(start)))
except Exception as e: except Exception as e:
debug(" - timeout(%s) CT+%.1f" % (hint, since(start))) debug(" - error(%s)(%r) CT+%.1f" % (hint, e, since(start)))
try: try:
if skt: if skt:
skt.shutdown(socket.SHUT_WR) skt.shutdown(socket.SHUT_WR)