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

changed "add socks5 header to data" to "add ss header to data"

Browse source 
and changed "remove socks5 header" to "remove ss header"
This commit is contained in:
Falseen 2017-02-17 21:08:50 +08:00
parent bfb5e93843
commit 70c8373a0f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shadowsocks/common.py
View file

@ -160,7 +160,7 @@ def pack_addr(address):
return b'\x03' + chr(len(address)) + address return b'\x03' + chr(len(address)) + address
# add socks5 request header # add ss header
def add_header(address, port, data): def add_header(address, port, data):
header = b'' header = b''
header = pack_addr(address) + struct.pack('>H', port) + data header = pack_addr(address) + struct.pack('>H', port) + data

4
shadowsocks/udprelay.py
View file

@ -158,7 +158,7 @@ class UDPRelay(object):
self._stat_callback(self._listen_port, len(data)) self._stat_callback(self._listen_port, len(data))
if self._is_local: if self._is_local:
if self.is_tunnel: if self.is_tunnel:
# add socks5 header to data # add ss header to data
tunnel_remote = self.tunnel_remote tunnel_remote = self.tunnel_remote
tunnel_remote_port = self.tunnel_remote_port tunnel_remote_port = self.tunnel_remote_port
data = common.add_header(tunnel_remote, data = common.add_header(tunnel_remote,
@ -282,7 +282,7 @@ class UDPRelay(object):
return return
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 socks5 header # remove ss header
response = data[7:] response = data[7:]
else: else:
response = b'\x00\x00\x00' + data response = b'\x00\x00\x00' + data