diff options
| author | Brian May <brian@linuxpenguins.xyz> | 2015-12-15 11:41:29 +1100 |
|---|---|---|
| committer | Brian May <brian@linuxpenguins.xyz> | 2015-12-15 11:41:48 +1100 |
| commit | bdc7d3a97cb1ee56a2401051150c9f35ef2d58ad (patch) | |
| tree | d74096762c5391fe6f07005855cbf5f97695ee66 | |
| parent | 90654b4fb95f608ae955cee5e3befd0041ac1c4a (diff) | |
Fix UDP Python 3.5 issues.
Closes: #48
| -rw-r--r-- | sshuttle/client.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sshuttle/client.py b/sshuttle/client.py index f906512..95a133b 100644 --- a/sshuttle/client.py +++ b/sshuttle/client.py @@ -289,7 +289,7 @@ def expire_connections(now, mux): for peer, (chan, timeout) in udp_by_src.items(): if timeout < now: debug3('expiring UDP channel channel=%d peer=%r\n' % (chan, peer)) - mux.send(chan, ssnet.CMD_UDP_CLOSE, '') + mux.send(chan, ssnet.CMD_UDP_CLOSE, b'') remove.append(peer) del mux.channels[chan] for peer in remove: @@ -335,7 +335,7 @@ def onaccept_tcp(listener, method, mux, handlers): def udp_done(chan, data, method, sock, dstip): - (src, srcport, data) = data.split(",", 2) + (src, srcport, data) = data.split(b",", 2) srcip = (src, int(srcport)) debug3('doing send from %r to %r\n' % (srcip, dstip,)) method.send_udp(sock, srcip, dstip, data) @@ -354,10 +354,10 @@ def onaccept_udp(listener, method, mux, handlers): chan = mux.next_channel() mux.channels[chan] = lambda cmd, data: udp_done( chan, data, method, listener, dstip=srcip) - mux.send(chan, ssnet.CMD_UDP_OPEN, listener.family) + mux.send(chan, ssnet.CMD_UDP_OPEN, b"%d" % listener.family) udp_by_src[srcip] = chan, now + 30 - hdr = "%s,%r," % (dstip[0], dstip[1]) + hdr = b"%s,%d," % (dstip[0].encode("ASCII"), dstip[1]) mux.send(chan, ssnet.CMD_UDP_DATA, hdr + data) expire_connections(now, mux) |