Merge pull request #481 from RockerFlower/master

Shadowsocks

shadowsocks/asyncdns.py

@@ -248,7 +248,7 @@ STATUS_IPV6 = 1
 
 class DNSResolver(object):
 
-    def __init__(self):
+    def __init__(self, server_list=None):
         self._loop = None
         self._hosts = {}
         self._hostname_status = {}
@@ -256,8 +256,11 @@ class DNSResolver(object):
         self._cb_to_hostname = {}
         self._cache = lru_cache.LRUCache(timeout=300)
         self._sock = None
-        self._servers = None
-        self._parse_resolv()
+        if server_list is None:
+            self._servers = None
+            self._parse_resolv()
+        else:
+            self._servers = server_list
         self._parse_hosts()
         # TODO monitor hosts change and reload hosts
         # TODO parse /etc/gai.conf and follow its rules

shadowsocks/daemon.py

@@ -117,7 +117,7 @@ def daemon_start(pid_file, log_file):
         sys.exit(1)
 
     os.setsid()
-    signal.signal(signal.SIG_IGN, signal.SIGHUP)
+    signal.signal(signal.SIGHUP, signal.SIG_IGN)
 
     print('started')
     os.kill(ppid, signal.SIGTERM)

shadowsocks/server.py

@@ -42,12 +42,13 @@ def main():
                          'will be ignored')
     else:
         config['port_password'] = {}
-        server_port = config['server_port']
-        if type(server_port) == list:
-            for a_server_port in server_port:
-                config['port_password'][a_server_port] = config['password']
-        else:
-            config['port_password'][str(server_port)] = config['password']
+        server_port = config.get('server_port', None)
+        if server_port:
+            if type(server_port) == list:
+                for a_server_port in server_port:
+                    config['port_password'][a_server_port] = config['password']
+            else:
+                config['port_password'][str(server_port)] = config['password']
 
     if config.get('manager_address', 0):
         logging.info('entering manager mode')
@@ -56,7 +57,12 @@ def main():
 
     tcp_servers = []
     udp_servers = []
-    dns_resolver = asyncdns.DNSResolver()
+
+    if 'dns_server' in config:  # allow override settings in resolv.conf
+        dns_resolver = asyncdns.DNSResolver(config['dns_server'])
+    else:
+        dns_resolver = asyncdns.DNSResolver()
+
     port_password = config['port_password']
     del config['port_password']
     for port, password in port_password.items():

shadowsocks/shell.py

@@ -84,7 +84,8 @@ def check_config(config, is_local):
         sys.exit(2)
 
     if not is_local and not config.get('password', None) \
-            and not config.get('port_password', None):
+            and not config.get('port_password', None) \
+            and not config.get('manager_address'):
         logging.error('password or port_password not specified')
         print_help(is_local)
         sys.exit(2)
@@ -92,7 +93,7 @@ def check_config(config, is_local):
     if 'local_port' in config:
         config['local_port'] = int(config['local_port'])
 
-    if 'server_port' in config and type(config['server_port']) != list:
+    if config.get('server_port', None) and type(config['server_port']) != list:
         config['server_port'] = int(config['server_port'])
 
     if config.get('local_address', '') in [b'0.0.0.0']:
@@ -240,7 +241,7 @@ def get_config(is_local):
         except Exception as e:
             logging.error(e)
             sys.exit(2)
-    config['server_port'] = config.get('server_port', 8388)
+    config['server_port'] = config.get('server_port', None)
 
     logging.getLogger('').handlers = []
     logging.addLevelName(VERBOSE_LEVEL, 'VERBOSE')