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

update the config name for tunnel

Browse source 
ord name:
tunnel_service tunnel_dns_server tunnel_dns_server_port tunnel_dns_local_port

new name:
both_tunnel_local tunnel_remote tunnel_remote_port tunnel_port
This commit is contained in:
Falseen 2017-02-17 16:52:43 +08:00
parent 1951a0660c
commit 029000ff8d
4 changed files with 25 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config.json.example
View file

@ -7,8 +7,8 @@
"method":"aes-256-cfb",
"local_address":"127.0.0.1",
"fast_open":false,
"tunnel_service":false,
"tunnel_dns_server":"8.8.8.8",
"tunnel_dns_server_port":53,
"tunnel_dns_local_port":53
"both_tunnel_local":false,
"tunnel_remote":"8.8.8.8",
"tunnel_remote_port":53,
"tunnel_port":53
}

20
shadowsocks/shell.py
View file

@ -159,11 +159,11 @@ def check_config(config, is_local):
if 'server_port' in config and type(config['server_port']) != list:
config['server_port'] = int(config['server_port'])
if 'tunnel_dns_server_port' in config:
config['tunnel_dns_server_port'] = \
int(config['tunnel_dns_server_port'])
if 'tunnel_dns_local_port' in config:
config['tunnel_dns_local_port'] = int(config['tunnel_dns_local_port'])
if 'tunnel_remote_port' in config:
config['tunnel_remote_port'] = \
int(config['tunnel_remote_port'])
if 'tunnel_port' in config:
config['tunnel_port'] = int(config['tunnel_port'])
if config.get('local_address', '') in [b'0.0.0.0']:
logging.warn('warning: local set to listen on 0.0.0.0, it\'s not safe')
@ -303,11 +303,11 @@ def get_config(is_local):
config['one_time_auth'] = config.get('one_time_auth', False)
config['prefer_ipv6'] = config.get('prefer_ipv6', False)
config['server_port'] = config.get('server_port', 8388)
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_port'] = config.get('tunnel_dns_server_port', 53)
config['tunnel_dns_local_port'] = config.get('tunnel_dns_local_port', 53)
config['both_tunnel_local'] = config.get('both_tunnel_local', False)
config['tunnel_server'] = \
to_str(config.get('tunnel_server', "8.8.8.8"))
config['tunnel_remote_port'] = config.get('tunnel_remote_port', 53)
config['tunnel_port'] = config.get('tunnel_port', 53)
logging.getLogger('').handlers = []
logging.addLevelName(VERBOSE_LEVEL, 'VERBOSE')

11
shadowsocks/tunnel.py
View file

@ -28,14 +28,9 @@ from shadowsocks import shell, daemon, eventloop, udprelay, asyncdns
def get_tunnel_udp_server(config, dns_resolver):
if config["tunnel_service"]:
config["local_port"] = config.copy()["tunnel_dns_local_port"]
logging.info("starting tunnel at %s:%d" % \
(config['local_address'], config['local_port']))
else:
logging.info("tunnel_service is False")
return
config["local_port"] = config.copy()["tunnel_port"]
logging.info("starting tunnel at %s:%d" % \
(config['local_address'], config['local_port']))
# tcp_server = tcprelay.TCPRelay(config, dns_resolver, True)
tunnel_udp_server = udprelay.UDPRelay(config, dns_resolver, True)
tunnel_udp_server.is_tunnel = True

16
shadowsocks/udprelay.py
View file

@ -94,10 +94,10 @@ class UDPRelay(object):
self._listen_port = config['server_port']
self._remote_addr = None
self._remote_port = None
self.tunnel_service = config.get('tunnel_service', False)
self.tunnel_dns_server = config.get('tunnel_dns_server', "8.8.8.8")
self.tunnel_dns_server_port = config.get('tunnel_dns_server_port', 53)
self.tunnel_dns_local_port = config.get('tunnel_dns_local_port', 53)
self.both_tunnel_local = config.get('both_tunnel_local', False)
self.tunnel_remote = config.get('tunnel_remote', "8.8.8.8")
self.tunnel_remote_port = config.get('tunnel_remote_port', 53)
self.tunnel_port = config.get('tunnel_port', 53)
self.is_tunnel = False
self._dns_resolver = dns_resolver
self._password = common.to_bytes(config['password'])
@ -158,10 +158,10 @@ class UDPRelay(object):
if self._is_local:
if self.is_tunnel:
# add socks5 header to data
tunnel_dns_server = self.tunnel_dns_server
tunnel_dns_server_port = self.tunnel_dns_server_port
data = common.add_header(tunnel_dns_server, \
tunnel_dns_server_port, data)
tunnel_remote = self.tunnel_remote
tunnel_remote_port = self.tunnel_remote_port
data = common.add_header(tunnel_remote, \
tunnel_remote_port, data)
else:
frag = common.ord(data[2])
if frag != 0: