diff --git a/config.json.example b/config.json.example index 1a7a178..95ac0f9 100644 --- a/config.json.example +++ b/config.json.example @@ -7,8 +7,8 @@ "method":"aes-256-cfb", "local_address":"127.0.0.1", "fast_open":false, - "dns_service":false, - "dns_server":"8.8.8.8", - "dns_server_port":53, - "dns_local_port":53 + "tunnel_service":false, + "tunnel_dns_server":"8.8.8.8", + "tunnel_dns_server_port":53, + "tunnel_dns_local_port":53 } diff --git a/shadowsocks/local.py b/shadowsocks/local.py index 5dc8830..232df99 100755 --- a/shadowsocks/local.py +++ b/shadowsocks/local.py @@ -52,7 +52,7 @@ def main(): tcp_server.add_to_loop(loop) udp_server.add_to_loop(loop) has_tunnel = False - if config["dns_service"]: + if config["tunnel_service"]: tunnel_udp_server = get_tunnel_udp_server(config.copy(), dns_resolver) tunnel_udp_server.add_to_loop(loop) has_tunnel = True diff --git a/shadowsocks/shell.py b/shadowsocks/shell.py index 8ecfce6..34d0e18 100644 --- a/shadowsocks/shell.py +++ b/shadowsocks/shell.py @@ -159,10 +159,10 @@ 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 'dns_server_port' in config: - config['dns_server_port'] = int(config['dns_server_port']) - if 'dns_local_port' in config: - config['dns_local_port'] = int(config['dns_local_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 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') @@ -302,10 +302,10 @@ 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['dns_service'] = config.get('dns_service', False) - config['dns_server'] = to_str(config.get('dns_server', "8.8.8.8")) - config['dns_server_port'] = config.get('dns_server_port', 53) - config['dns_local_port'] = config.get('dns_local_port', 53) + 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) logging.getLogger('').handlers = [] logging.addLevelName(VERBOSE_LEVEL, 'VERBOSE') diff --git a/shadowsocks/tunnel.py b/shadowsocks/tunnel.py index 281175b..38fd2ef 100644 --- a/shadowsocks/tunnel.py +++ b/shadowsocks/tunnel.py @@ -28,12 +28,12 @@ from shadowsocks import shell, daemon, eventloop, udprelay, asyncdns def get_tunnel_udp_server(config, dns_resolver): - if config["dns_service"]: - config["local_port"] = config.copy()["dns_local_port"] + 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("dns_service is False") + logging.info("tunnel_service is False") return # tcp_server = tcprelay.TCPRelay(config, dns_resolver, True) diff --git a/shadowsocks/udprelay.py b/shadowsocks/udprelay.py index 3e8adfd..1822f1c 100644 --- a/shadowsocks/udprelay.py +++ b/shadowsocks/udprelay.py @@ -94,10 +94,10 @@ class UDPRelay(object): self._listen_port = config['server_port'] self._remote_addr = None self._remote_port = None - self.dns_service = config.get('dns_service', False) - self.dns_server = config.get('dns_server', "8.8.8.8") - self.dns_server_port = config.get('dns_server_port', 53) - self.dns_local_port = config.get('dns_local_port', 53) + 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.is_tunnel = False self._dns_resolver = dns_resolver self._password = common.to_bytes(config['password']) @@ -158,9 +158,9 @@ class UDPRelay(object): if self._is_local: if self.is_tunnel: # add socks5 header to data - dns_server = self.dns_server - dns_server_port = self.dns_server_port - data = common.add_header(dns_server, dns_server_port, 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) else: frag = common.ord(data[2]) if frag != 0: