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

update for tunnel

Browse source 
update to local.py shell.py tunnel.py for tunnel
This commit is contained in:
Falseen 2017-02-17 17:16:58 +08:00
parent 029000ff8d
commit 64282b0018
3 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shadowsocks/local.py
View file

@ -25,7 +25,6 @@ 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, tcprelay, udprelay, asyncdns
from tunnel import get_tunnel_udp_server
@shell.exception_handle(self_=False, exit_code=1) @shell.exception_handle(self_=False, exit_code=1)
@ -52,9 +51,14 @@ def main():
tcp_server.add_to_loop(loop) tcp_server.add_to_loop(loop)
udp_server.add_to_loop(loop) udp_server.add_to_loop(loop)
has_tunnel = False has_tunnel = False
# if tunnel_service is True then run tunnel_udp_server # if both_tunnel_local is True then run tunnel_udp_server
if config["tunnel_service"]: if config["both_tunnel_local"]:
tunnel_udp_server = get_tunnel_udp_server(config.copy(), dns_resolver) config["local_port"] = config.copy()["tunnel_port"]
logging.info("starting tunnel at %s:%d forward to %s:%d" % \
(config['local_address'], config['local_port'], config['tunnel_remote'], \
config['tunnel_remote_port']))
tunnel_udp_server = udprelay.UDPRelay(config, dns_resolver, True)
tunnel_udp_server.is_tunnel = True
tunnel_udp_server.add_to_loop(loop) tunnel_udp_server.add_to_loop(loop)
has_tunnel = True has_tunnel = True

4
shadowsocks/shell.py
View file

@ -304,8 +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['both_tunnel_local'] = config.get('both_tunnel_local', False) config['both_tunnel_local'] = config.get('both_tunnel_local', False)
config['tunnel_server'] = \ config['tunnel_remote'] = \
to_str(config.get('tunnel_server', "8.8.8.8")) to_str(config.get('tunnel_remote', '8.8.8.8'))
config['tunnel_remote_port'] = config.get('tunnel_remote_port', 53) config['tunnel_remote_port'] = config.get('tunnel_remote_port', 53)
config['tunnel_port'] = config.get('tunnel_port', 53) config['tunnel_port'] = config.get('tunnel_port', 53)

19
shadowsocks/tunnel.py
View file

@ -27,16 +27,6 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../'))
from shadowsocks import shell, daemon, eventloop, udprelay, asyncdns from shadowsocks import shell, daemon, eventloop, udprelay, asyncdns
def get_tunnel_udp_server(config, dns_resolver):
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
return tunnel_udp_server
@shell.exception_handle(self_=False, exit_code=1) @shell.exception_handle(self_=False, exit_code=1)
def main(): def main():
shell.check_python() shell.check_python()
@ -50,12 +40,15 @@ def main():
config = shell.get_config(True) config = shell.get_config(True)
daemon.daemon_exec(config) daemon.daemon_exec(config)
dns_resolver = asyncdns.DNSResolver() dns_resolver = asyncdns.DNSResolver()
# if running tunnel then update tunnel_service to True
config["tunnel_service"] = True
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)
config["local_port"] = config.copy()["tunnel_port"]
logging.info("starting tunnel at %s:%d forward to %s:%d" % \
(config['local_address'], config['local_port'], config['tunnel_remote'], \
config['tunnel_remote_port']))
tunnel_udp_server = udprelay.UDPRelay(config, dns_resolver, True)
tunnel_udp_server.is_tunnel = True
tunnel_udp_server.add_to_loop(loop) tunnel_udp_server.add_to_loop(loop)
def handler(signum, _): def handler(signum, _):