adapt shadowsocks3.0

shadowsocks/asyncdns.py

@@ -18,7 +18,6 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement
 
-import sys
 import os
 import socket
 import struct
@@ -30,7 +29,7 @@
 
 CACHE_SWEEP_INTERVAL = 30
 
-VALID_HOSTNAME = re.compile(br"(?!-)[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE)
+VALID_HOSTNAME = re.compile(br"(?!-)[A-Z\d\-_]{1,63}(?<!-)$", re.IGNORECASE)
 
 common.patch_socket()
 
@@ -277,15 +276,18 @@ def _parse_resolv(self):
                 content = f.readlines()
                 for line in content:
                     line = line.strip()
-                    if line:
-                        if line.startswith(b'nameserver'):
-                            parts = line.split()
-                            if len(parts) >= 2:
-                                server = parts[1]
-                                if common.is_ip(server) == socket.AF_INET:
-                                    if type(server) != str:
-                                        server = server.decode('utf8')
-                                    self._servers.append(server)
+                    if not (line and line.startswith(b'nameserver')):
+                        continue
+
+                    parts = line.split()
+                    if len(parts) < 2:
+                        continue
+
+                    server = parts[1]
+                    if common.is_ip(server) == socket.AF_INET:
+                        if type(server) != str:
+                            server = server.decode('utf8')
+                        self._servers.append(server)
         except IOError:
             pass
         if not self._servers:
@@ -300,13 +302,17 @@ def _parse_hosts(self):
                 for line in f.readlines():
                     line = line.strip()
                     parts = line.split()
-                    if len(parts) >= 2:
-                        ip = parts[0]
-                        if common.is_ip(ip):
-                            for i in range(1, len(parts)):
-                                hostname = parts[i]
-                                if hostname:
-                                    self._hosts[hostname] = ip
+                    if len(parts) < 2:
+                        continue
+
+                    ip = parts[0]
+                    if not common.is_ip(ip):
+                        continue
+
+                    for i in range(1, len(parts)):
+                        hostname = parts[i]
+                        if hostname:
+                            self._hosts[hostname] = ip
         except IOError:
             self._hosts['localhost'] = '127.0.0.1'
 

shadowsocks/common.py

@@ -146,6 +146,7 @@ def patch_socket():
 
 def pack_addr(address):
     address_str = to_str(address)
+    address = to_bytes(address)
     for family in (socket.AF_INET, socket.AF_INET6):
         try:
             r = socket.inet_pton(family, address_str)
@@ -160,6 +161,13 @@ def pack_addr(address):
     return b'\x03' + chr(len(address)) + address
 
 
+# add ss header
+def add_header(address, port, data=b''):
+    _data = b''
+    _data = pack_addr(address) + struct.pack('>H', port) + data
+    return _data
+
+
 def parse_header(data):
     addrtype = ord(data[0])
     dest_addr = None