fix error about pep8 and pyflakes for travis
This commit is contained in:
parent
4d5f14986a
commit
ec9ffbdf04
3 changed files with 16 additions and 11 deletions
|
@ -159,12 +159,14 @@ def pack_addr(address):
|
|||
address = address[:255] # TODO
|
||||
return b'\x03' + chr(len(address)) + address
|
||||
|
||||
|
||||
# add socks5 request header
|
||||
def add_header(address, port, data):
|
||||
header = b''
|
||||
header = pack_addr(address) + struct.pack('>H', port) + data
|
||||
return header
|
||||
|
||||
|
||||
def parse_header(data):
|
||||
addrtype = ord(data[0])
|
||||
dest_addr = None
|
||||
|
|
|
@ -24,7 +24,8 @@ import logging
|
|||
import signal
|
||||
|
||||
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):
|
||||
if config["dns_service"]:
|
||||
|
|
|
@ -182,7 +182,8 @@ class UDPRelay(object):
|
|||
if header_result is None:
|
||||
return
|
||||
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:
|
||||
server_addr, server_port = self._get_a_server()
|
||||
else:
|
||||
|
@ -285,7 +286,8 @@ class UDPRelay(object):
|
|||
response = b'\x00\x00\x00' + data
|
||||
client_addr = self._client_fd_to_server_addr.get(sock.fileno())
|
||||
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)
|
||||
else:
|
||||
# this packet is from somewhere else we know
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue