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

fix UDP

Browse source
This commit is contained in:
clowwindy 2014-10-31 21:49:22 +08:00
parent 5024b300f1
commit a502dd32fc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shadowsocks/encrypt.py
View file

@ -204,4 +204,4 @@ def encrypt_all(password, method, op, data):
data = data[iv_len:] data = data[iv_len:]
cipher = m(method, key, iv, op) cipher = m(method, key, iv, op)
result.append(cipher.update(data)) result.append(cipher.update(data))
return ''.join(result) return b''.join(result)

2
shadowsocks/udprelay.py
View file

@ -229,7 +229,7 @@ class UDPRelay(object):
if header_result is None: if header_result is None:
return return
# addrtype, dest_addr, dest_port, header_length = header_result # addrtype, dest_addr, dest_port, header_length = header_result
response = '\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())
if client_addr: if client_addr:
self._server_socket.sendto(response, client_addr) self._server_socket.sendto(response, client_addr)