vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tcprelay.py: decode remote_addr to fix extra b'' in logging on python 3

Browse source
This commit is contained in:
Felix Yan 2014-11-02 00:23:44 +08:00
parent 4e08344035
commit 833c98e114
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shadowsocks/tcprelay.py
View file

@ -261,7 +261,7 @@ class TCPRelayHandler(object):
if header_result is None: if header_result is None:
raise Exception('can not parse header') raise Exception('can not parse header')
addrtype, remote_addr, remote_port, header_length = header_result addrtype, remote_addr, remote_port, header_length = header_result
logging.info('connecting %s:%d' % (remote_addr, remote_port)) logging.info('connecting %s:%d' % (remote_addr.decode('utf-8'), remote_port))
self._remote_address = (remote_addr, remote_port) self._remote_address = (remote_addr, remote_port)
# pause reading # pause reading
self._update_stream(STREAM_UP, WAIT_STATUS_WRITING) self._update_stream(STREAM_UP, WAIT_STATUS_WRITING)