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

fix server-multi-ports

Browse source
This commit is contained in:
clowwindy 2014-07-11 18:40:18 +08:00
parent c788aa59b6
commit 040c956472
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
shadowsocks/udprelay.py
View file

@ -71,6 +71,7 @@ import socket
import logging import logging
import struct import struct
import errno import errno
import random
import encrypt import encrypt
import eventloop import eventloop
import lru_cache import lru_cache
@ -86,6 +87,7 @@ def client_key(a, b, c, d):
class UDPRelay(object): class UDPRelay(object):
def __init__(self, config, dns_resolver, is_local): def __init__(self, config, dns_resolver, is_local):
self._config = config
if is_local: if is_local:
self._listen_addr = config['local_address'] self._listen_addr = config['local_address']
self._listen_port = config['local_port'] self._listen_port = config['local_port']
@ -121,6 +123,15 @@ class UDPRelay(object):
server_socket.setblocking(False) server_socket.setblocking(False)
self._server_socket = server_socket self._server_socket = server_socket
def _get_a_server(self):
server = self._config['server']
server_port = self._config['server_port']
if type(server_port) == list:
server_port = random.choice(server_port)
logging.debug('chosen server: %s:%d', server, server_port)
# TODO support multiple server IP
return server, server_port
def _close_client(self, client): def _close_client(self, client):
if hasattr(client, 'close'): if hasattr(client, 'close'):
self._sockets.remove(client.fileno()) self._sockets.remove(client.fileno())
@ -154,7 +165,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_local: if self._is_local:
server_addr, server_port = self._remote_addr, self._remote_port server_addr, server_port = self._get_a_server()
else: else:
server_addr, server_port = dest_addr, dest_port server_addr, server_port = dest_addr, dest_port