5.16.6 fix minor bugs #14127

Author: Michael-X-Net

code/default/lib/noarch/front_base/ip_manager.py

@@ -549,8 +549,7 @@ def get_ip_sni_host(self, to_recheck=False):
                     self.ip_pointer += 1
                     continue
 
-                handshake_time = self.ip_dict[ip_str]["handshake_time"]
-                # self.logger.debug("get ip:%s t:%d", ip, handshake_time)
+                # self.logger.debug("get ip:%s t:%d", ip, self.ip_dict[ip_str]["handshake_time"])
                 self.append_ip_history(ip_str, "get")
                 self.ip_dict[ip_str]['get_time'] = time_now
                 if not to_recheck:
@@ -568,7 +567,7 @@ def get_ip_sni_host(self, to_recheck=False):
         finally:
             self.ip_lock.release()
 
-        return None, None, None
+        return None
 
     def add_ip(self, ip_str, handshake_time=100, domain=None, server='gws', fail_times=0, down_fail=0,
                scan_result=True):

code/default/smart_router/local/dns_query.py

@@ -461,17 +461,35 @@ def query(self, domain, dns_type=1):
 
 
 class DnsOverTlsQuery(DnsOverTcpQuery):
-    def __init__(self, server_list=[b"1.1.1.1", b"9.9.9.9"]):
+    def __init__(self, server_list=None):
+        if not server_list:
+            server_list = [
+                {
+                    "domain": "one.one.one.one",
+                    "ipv4s": [b"1.1.1.1", b"1.0.0.1"],
+                },
+                {
+                    "domain": "dns.quad9.net",
+                    "ipv4s": [b"9.9.9.9", b"149.112.112.112"],
+                }
+            ]
+
         DnsOverTcpQuery.__init__(self, server_list=server_list, port=853)
         self.protocol = "DoT"
         self.ssl_context = ssl.create_default_context()
         self.ssl_context.check_hostname = False
         self.ssl_context.verify_mode = ssl.CERT_REQUIRED
 
     def connect(self, host, port):
-        s = super(DnsOverTlsQuery, self).connect(host, port)
-        sock = self.ssl_context.wrap_socket(s, server_hostname=host)
-        return sock
+        domain = host["domain"]
+        ipv4 =  random.choice(host["ipv4s"])
+        try:
+            s = super(DnsOverTlsQuery, self).connect(ipv4, port)
+            sock = self.ssl_context.wrap_socket(s, server_hostname=domain)
+            return sock
+        except Exception as e:
+            xlog.warn("DnsOverTlsQuery connect %s %s:%d fail:%r", ipv4, domain, port, e)
+            return None
 
 
 class DnsOverHttpsQuery(object):

code/default/version.txt

@@ -1 +1 @@
-5.16.5
+5.16.6