5.5.6 update smart route policy and fix connection block issue.

Author: Michael-X-Net

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

@@ -156,6 +156,7 @@ def __init__(self, logger, config, connect_creator, ip_manager, check_local_netw
 
         self.thread_num_lock = threading.Lock()
         self.timeout = 4
+        self.start_connect_time = 0
         self.thread_num = 0
         self.running = True
 
@@ -233,6 +234,12 @@ def _create_more_connection(self):
                 self.connecting_more_thread.start()
 
     def _create_more_connection_worker(self):
+        if self.start_connect_time and self.start_connect_time + 30 < time.time():
+            self.start_connect_time = 0
+            self.config.https_max_connect_thread += 1
+            self.logger.warning("Connect creating process blocked, max connect thread increase to %d",
+                                self.config.https_max_connect_thread)
+
         while self.thread_num < self.config.https_max_connect_thread and self._need_more_ip():
 
             self.thread_num_lock.acquire()
@@ -254,7 +261,9 @@ def _connect_thread(self, sleep_time=0):
                 if self.new_conn_pool.qsize() > self.config.https_connection_pool_max:
                     break
 
+                self.start_connect_time = time.time()
                 self._connect_process()
+                self.start_connect_time = 0
         finally:
             self.thread_num_lock.acquire()
             self.thread_num -= 1

code/default/smart_router/local/gfw_black_list.txt

@@ -1907,6 +1907,7 @@ googleplus.com
 googlescholar.com
 googlesile.com
 googlesource.com
+googlesyndication.com
 googletagservices.com
 googleusercontent.com
 googlevideo.com

code/default/smart_router/local/ip_region.py

@@ -89,6 +89,7 @@ def check_ip(self, ip):
         return lo & 1
 
     def check_ips(self, ips):
+        # return True if any ip in China
         ips = utils.to_str(ips)
         for ip in ips:
             try:

code/default/smart_router/local/smart_route.py

@@ -562,7 +562,7 @@ def handle_domain_proxy(sock, host, port, client_address, left_buf=""):
     #ips = g.dns_query.query(host)
     #if check_local_network.IPv6.is_ok() and have_ipv6(ips) and port == 443:
     #    rule_list = ["direct", "gae", "socks", "redirect_https"]
-    # gae is more faster then direct.
+    # gae is fast then direct.
 
     rule = g.domain_cache.get_rule(host)
     if rule != "unknown":
@@ -586,9 +586,9 @@ def handle_domain_proxy(sock, host, port, client_address, left_buf=""):
         else:
             ips = g.dns_query.query_recursively(host, 1)
             if g.ip_region.check_ips(ips):
-                rule_list = ["direct", "socks", "redirect_https"]
+                rule_list = ["direct", "redirect_https", "socks", "gae"]
             else:
-                rule_list = ["direct", "gae", "socks", "redirect_https"]
+                rule_list = ["gae", "socks", "direct", "redirect_https"]
     else:
         rule_list = ["direct", "socks", "gae", "redirect_https"]
 

code/default/version.txt

@@ -1 +1 @@
-5.5.5
+5.5.6

code/default/x_tunnel/local/base_container.py

@@ -694,7 +694,7 @@ def send_to_sock(self, data):
             try:
                 sended = sock.send(buf[start:start + send_size])
             except Exception as e:
-                self.xlog.info("%s conn:%d send closed", self.session.session_id, self.conn_id)
+                self.xlog.info("%s conn:%d send closed: %r", self.session.session_id, self.conn_id, e)
                 sock.close()
                 self.sock = None
                 if self.is_client: