fix search domain fail which has '-'

Author: XndroidDev

fqrouter/manager/fqsocks/gateways/proxy_client.py

@@ -444,11 +444,14 @@ def analyze_protocol(peeked_data):
     return 'UNKNOWN', ''
 
 
+domain_pattern = re.compile(r'\x00\x00(.)([\w\.-]{1,220}\.\w{2,25})', re.S)
+
 def parse_sni_domain(data):
     domain = ''
     try:
         # extrace SNI from ClientHello packet, quick and dirty.
-        domain = (m.group(2) for m in re.finditer('\x00\x00(.)([\\w\\.]{4,255})', data)
+        # domain = (m.group(2) for m in re.finditer('\x00\x00(.)([\\w\\.]{4,255})', data)
+        domain = (m.group(2) for m in re.finditer(domain_pattern, data)
                   if ord(m.group(1)) == len(m.group(2))).next()
     except StopIteration:
         pass

fqrouter/manager/teredo.py

@@ -329,8 +329,8 @@ def start(self):
         gevent.spawn(teredo_client.maintain_forever, self)
         gevent.spawn(teredo_client.retry_connectivity_test_forever, self)
 
-        return self.inet_ntop(self.teredo_ip)
-        # return socket.inet_ntop(socket.AF_INET6, self.teredo_ip)
+        # return self.inet_ntop(self.teredo_ip)
+        return socket.inet_ntop(socket.AF_INET6, self.teredo_ip)
 
     def getaddr_ipv6(self, data):
         return struct.unpack('!16s16s', data[8:40])