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

fix recv data bug

Browse source
This commit is contained in:
BreakWa11 2016-06-16 22:42:23 +08:00
parent 8556fd3c18
commit 97785aae2e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/tcprelay.py
View file

@ -662,7 +662,7 @@ class TCPRelayHandler(object):
data = obfs_decode[0] data = obfs_decode[0]
try: try:
newdata = self._protocol.server_post_decrypt(data) newdata = self._protocol.server_post_decrypt(data)
if data and not newdata: '''if data and not newdata:
data = self._protocol.server_pre_encrypt(data) data = self._protocol.server_pre_encrypt(data)
data = self._encryptor.encrypt(data) data = self._encryptor.encrypt(data)
data = self._obfs.server_encode(data) data = self._obfs.server_encode(data)
@ -674,7 +674,7 @@ class TCPRelayHandler(object):
traceback.print_exc() traceback.print_exc()
logging.error("exception from %s:%d" % (self._client_address[0], self._client_address[1])) logging.error("exception from %s:%d" % (self._client_address[0], self._client_address[1]))
self.destroy() self.destroy()
return return'''
data = newdata data = newdata
except Exception as e: except Exception as e:
shell.print_exception(e) shell.print_exception(e)