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

fix error about pep8 and pyflakes for travis

Browse source
This commit is contained in:
Falseen 2017-02-17 02:41:10 +08:00
parent 4d5f14986a
commit ec9ffbdf04
3 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/common.py
View file

@ -159,12 +159,14 @@ def pack_addr(address):
address = address[:255] # TODO address = address[:255] # TODO
return b'\x03' + chr(len(address)) + address return b'\x03' + chr(len(address)) + address
# add socks5 request header # add socks5 request header
def add_header(address, port ,data): def add_header(address, port, data):
header = b'' header = b''
header = pack_addr(address) + struct.pack('>H', port) + data header = pack_addr(address) + struct.pack('>H', port) + data
return header return header
def parse_header(data): def parse_header(data):
addrtype = ord(data[0]) addrtype = ord(data[0])
dest_addr = None dest_addr = None

9
shadowsocks/tunnel.py
View file

@ -24,7 +24,8 @@ import logging
import signal import signal
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../')) sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../'))
from shadowsocks import shell, daemon, eventloop, tcprelay, udprelay, asyncdns 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["dns_service"]: if config["dns_service"]:
@ -35,7 +36,7 @@ def get_tunnel_udp_server(config, dns_resolver):
logging.info("dns_service is False") logging.info("dns_service is False")
return return
#tcp_server = tcprelay.TCPRelay(config, dns_resolver, True) # tcp_server = tcprelay.TCPRelay(config, dns_resolver, True)
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
return tunnel_udp_server return tunnel_udp_server
@ -57,12 +58,12 @@ def main():
tunnel_udp_server = get_tunnel_udp_server(config, dns_resolver) tunnel_udp_server = get_tunnel_udp_server(config, dns_resolver)
loop = eventloop.EventLoop() loop = eventloop.EventLoop()
dns_resolver.add_to_loop(loop) dns_resolver.add_to_loop(loop)
#tcp_server.add_to_loop(loop) # tcp_server.add_to_loop(loop)
tunnel_udp_server.add_to_loop(loop) tunnel_udp_server.add_to_loop(loop)
def handler(signum, _): def handler(signum, _):
logging.warn('received SIGQUIT, doing graceful shutting down..') logging.warn('received SIGQUIT, doing graceful shutting down..')
#tcp_server.close(next_tick=True) # tcp_server.close(next_tick=True)
tunnel_udp_server.close(next_tick=True) tunnel_udp_server.close(next_tick=True)
signal.signal(getattr(signal, 'SIGQUIT', signal.SIGTERM), handler) signal.signal(getattr(signal, 'SIGQUIT', signal.SIGTERM), handler)

8
shadowsocks/udprelay.py
View file

@ -157,7 +157,7 @@ class UDPRelay(object):
self._stat_callback(self._listen_port, len(data)) self._stat_callback(self._listen_port, len(data))
if self._is_local: if self._is_local:
if self.is_tunnel: if self.is_tunnel:
#add socks5 header to data # add socks5 header to data
dns_server = self.dns_server dns_server = self.dns_server
dns_server_port = self.dns_server_port dns_server_port = self.dns_server_port
data = common.add_header(dns_server, dns_server_port, data) data = common.add_header(dns_server, dns_server_port, data)
@ -182,7 +182,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" %(dest_addr, dest_port, r_addr[0], r_addr[1])) logging.info("udp data to %s:%d from %s:%d"
%(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:
@ -285,7 +286,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" %(client_addr[0], client_addr[1])) logging.debug("send udp response to %s:%d"
%(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