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

init user_id

Browse source
This commit is contained in:
破娃酱 2017-05-27 13:06:35 +08:00
parent 77628acde4
commit c1364c3afe
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shadowsocks/udprelay.py
View file

@ -412,6 +412,7 @@ class UDPRelay(object):
self._handle_server_dns_resolved((server_addr, server_port), None, server_addr, False, data, r_addr, uid, header_length) self._handle_server_dns_resolved((server_addr, server_port), None, server_addr, False, data, r_addr, uid, header_length)
def _handle_server_dns_resolved(self, remote_addr, addrs, server_addr, dns_resolved, data, r_addr, uid, header_length): def _handle_server_dns_resolved(self, remote_addr, addrs, server_addr, dns_resolved, data, r_addr, uid, header_length):
user_id = self._listen_port
try: try:
server_port = remote_addr[1] server_port = remote_addr[1]
if addrs is None: if addrs is None:
@ -457,9 +458,7 @@ class UDPRelay(object):
logging.debug('UDP port %5d sockets %d' % (self._listen_port, len(self._sockets))) logging.debug('UDP port %5d sockets %d' % (self._listen_port, len(self._sockets)))
if uid is None: if uid is not None:
user_id = self._listen_port
else:
user_id = struct.unpack('<I', client_uid)[0] user_id = struct.unpack('<I', client_uid)[0]
else: else:
client, client_uid = client_pair client, client_uid = client_pair