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

remove ss_header from tcprelay.py and update the "header_length" to udprelay.py

Browse source 
1. Remove unnecessary "add ss_header" from tcprelay.py

2. update "data[7:]" to "data[header_length:]"
This commit is contained in:
Falseen 2017-02-20 19:38:24 +08:00
parent 19027aeba8
commit 57f55bf347
2 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shadowsocks/tcprelay.py
View file

@ -256,12 +256,6 @@ class TCPRelayHandler(object):
else: else:
self._data_to_write_to_remote.append(data) self._data_to_write_to_remote.append(data)
return return
if self.is_tunnel:
# add ss header to data
tunnel_remote = self.tunnel_remote
tunnel_remote_port = self.tunnel_remote_port
data = common.add_header(tunnel_remote,
tunnel_remote_port, data)
if self._ota_enable_session: if self._ota_enable_session:
data = self._ota_chunk_data_gen(data) data = self._ota_chunk_data_gen(data)
data = self._encryptor.encrypt(data) data = self._encryptor.encrypt(data)
@ -504,12 +498,6 @@ class TCPRelayHandler(object):
def _handle_stage_stream(self, data): def _handle_stage_stream(self, data):
if self._is_local: if self._is_local:
if self.is_tunnel:
# add ss header to data
tunnel_remote = self.tunnel_remote
tunnel_remote_port = self.tunnel_remote_port
data = common.add_header(tunnel_remote,
tunnel_remote_port, data)
if self._ota_enable_session: if self._ota_enable_session:
data = self._ota_chunk_data_gen(data) data = self._ota_chunk_data_gen(data)
data = self._encryptor.encrypt(data) data = self._encryptor.encrypt(data)

2
shadowsocks/udprelay.py
View file

@ -283,7 +283,7 @@ class UDPRelay(object):
addrtype, dest_addr, dest_port, header_length = header_result addrtype, dest_addr, dest_port, header_length = header_result
if self.is_tunnel: if self.is_tunnel:
# remove ss header # remove ss header
response = data[7:] response = data[header_length:]
else: else:
response = b'\x00\x00\x00' + data response = b'\x00\x00\x00' + data
client_addr = self._client_fd_to_server_addr.get(sock.fileno()) client_addr = self._client_fd_to_server_addr.get(sock.fileno())