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

fix pep8 for travis

Browse source
This commit is contained in:
Falseen 2017-02-17 03:32:39 +08:00
parent 044354779a
commit 1951a0660c
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shadowsocks/shell.py
View file

@ -160,7 +160,8 @@ def check_config(config, is_local):
config['server_port'] = int(config['server_port']) config['server_port'] = int(config['server_port'])
if 'tunnel_dns_server_port' in config: if 'tunnel_dns_server_port' in config:
config['tunnel_dns_server_port'] = int(config['tunnel_dns_server_port']) config['tunnel_dns_server_port'] = \
int(config['tunnel_dns_server_port'])
if 'tunnel_dns_local_port' in config: if 'tunnel_dns_local_port' in config:
config['tunnel_dns_local_port'] = int(config['tunnel_dns_local_port']) config['tunnel_dns_local_port'] = int(config['tunnel_dns_local_port'])
@ -303,7 +304,8 @@ def get_config(is_local):
config['prefer_ipv6'] = config.get('prefer_ipv6', False) config['prefer_ipv6'] = config.get('prefer_ipv6', False)
config['server_port'] = config.get('server_port', 8388) config['server_port'] = config.get('server_port', 8388)
config['tunnel_service'] = config.get('tunnel_service', False) config['tunnel_service'] = config.get('tunnel_service', False)
config['tunnel_dns_server'] = to_str(config.get('tunnel_dns_server', "8.8.8.8")) config['tunnel_dns_server'] = \
to_str(config.get('tunnel_dns_server', "8.8.8.8"))
config['tunnel_dns_server_port'] = config.get('tunnel_dns_server_port', 53) config['tunnel_dns_server_port'] = config.get('tunnel_dns_server_port', 53)
config['tunnel_dns_local_port'] = config.get('tunnel_dns_local_port', 53) config['tunnel_dns_local_port'] = config.get('tunnel_dns_local_port', 53)

2
shadowsocks/tunnel.py
View file

@ -30,7 +30,7 @@ from shadowsocks import shell, daemon, eventloop, udprelay, asyncdns
def get_tunnel_udp_server(config, dns_resolver): def get_tunnel_udp_server(config, dns_resolver):
if config["tunnel_service"]: if config["tunnel_service"]:
config["local_port"] = config.copy()["tunnel_dns_local_port"] config["local_port"] = config.copy()["tunnel_dns_local_port"]
logging.info("starting tunnel at %s:%d" % logging.info("starting tunnel at %s:%d" % \
(config['local_address'], config['local_port'])) (config['local_address'], config['local_port']))
else: else:
logging.info("tunnel_service is False") logging.info("tunnel_service is False")

7
shadowsocks/udprelay.py
View file

@ -160,7 +160,8 @@ class UDPRelay(object):
# add socks5 header to data # add socks5 header to data
tunnel_dns_server = self.tunnel_dns_server tunnel_dns_server = self.tunnel_dns_server
tunnel_dns_server_port = self.tunnel_dns_server_port tunnel_dns_server_port = self.tunnel_dns_server_port
data = common.add_header(tunnel_dns_server, tunnel_dns_server_port, data) data = common.add_header(tunnel_dns_server, \
tunnel_dns_server_port, data)
else: else:
frag = common.ord(data[2]) frag = common.ord(data[2])
if frag != 0: if frag != 0:
@ -182,7 +183,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
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()
@ -286,7 +287,7 @@ 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: