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

update pep8 for travis

Browse source
This commit is contained in:
Falseen 2017-02-17 17:25:30 +08:00
parent 64282b0018
commit ac1883eb7f
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/local.py
View file

@ -54,8 +54,8 @@ def main():
# if both_tunnel_local is True then run tunnel_udp_server # if both_tunnel_local is True then run tunnel_udp_server
if config["both_tunnel_local"]: if config["both_tunnel_local"]:
config["local_port"] = config.copy()["tunnel_port"] config["local_port"] = config.copy()["tunnel_port"]
logging.info("starting tunnel at %s:%d forward to %s:%d" % \ logging.info("starting tunnel at %s:%d forward to %s:%d" %
(config['local_address'], config['local_port'], config['tunnel_remote'], \ (config['local_address'], config['local_port'], config['tunnel_remote'],
config['tunnel_remote_port'])) config['tunnel_remote_port']))
tunnel_udp_server = udprelay.UDPRelay(config, dns_resolver, True) tunnel_udp_server = udprelay.UDPRelay(config, dns_resolver, True)
tunnel_udp_server.is_tunnel = True tunnel_udp_server.is_tunnel = True

4
shadowsocks/tunnel.py
View file

@ -44,8 +44,8 @@ def main():
dns_resolver.add_to_loop(loop) dns_resolver.add_to_loop(loop)
# tcp_server.add_to_loop(loop) # tcp_server.add_to_loop(loop)
config["local_port"] = config.copy()["tunnel_port"] config["local_port"] = config.copy()["tunnel_port"]
logging.info("starting tunnel at %s:%d forward to %s:%d" % \ logging.info("starting tunnel at %s:%d forward to %s:%d" %
(config['local_address'], config['local_port'], config['tunnel_remote'], \ (config['local_address'], config['local_port'], config['tunnel_remote'],
config['tunnel_remote_port'])) config['tunnel_remote_port']))
tunnel_udp_server = udprelay.UDPRelay(config, dns_resolver, True) tunnel_udp_server = udprelay.UDPRelay(config, dns_resolver, True)
tunnel_udp_server.is_tunnel = True tunnel_udp_server.is_tunnel = True

11
shadowsocks/udprelay.py
View file

@ -82,6 +82,7 @@ def client_key(source_addr, server_af):
class UDPRelay(object): class UDPRelay(object):
def __init__(self, config, dns_resolver, is_local, stat_callback=None): def __init__(self, config, dns_resolver, is_local, stat_callback=None):
self._config = config self._config = config
if is_local: if is_local:
@ -160,7 +161,7 @@ class UDPRelay(object):
# add socks5 header to data # add socks5 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,
tunnel_remote_port, data) tunnel_remote_port, data)
else: else:
frag = common.ord(data[2]) frag = common.ord(data[2])
@ -183,8 +184,8 @@ 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
logging.info("udp data to %s:%d from %s:%d" \ logging.info("udp data to %s:%d from %s:%d"
%(dest_addr, dest_port, r_addr[0], r_addr[1])) % (dest_addr, dest_port, r_addr[0], r_addr[1]))
if self._is_local: if self._is_local:
server_addr, server_port = self._get_a_server() server_addr, server_port = self._get_a_server()
else: else:
@ -287,8 +288,8 @@ class UDPRelay(object):
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())
if client_addr: if client_addr:
logging.debug("send udp response to %s:%d" \ logging.debug("send udp response to %s:%d"
%(client_addr[0], client_addr[1])) % (client_addr[0], client_addr[1]))
self._server_socket.sendto(response, client_addr) self._server_socket.sendto(response, client_addr)
else: else:
# this packet is from somewhere else we know # this packet is from somewhere else we know