use new algorithm.

XX-net · Jul 18, 2023 · 36b63b3 · 36b63b3
1 parent 9bd0da8
commit 36b63b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/code/default/x_tunnel/local/cloudflare_front/ip_manager.py b/code/default/x_tunnel/local/cloudflare_front/ip_manager.py
@@ -96,7 +96,6 @@ def report_connect_fail(self, ip_str, sni=None, reason="", force_remove=True):
 
         info = self._get_domain(top_domain)
         info["fail_times"] += 1
-        info["last_try"] = time.time()
         self.logger.debug("ip %s sni:%s connect fail, reason:%s", ip, sni, reason)
 
     def update_ip(self, ip_str, sni, handshake_time):

diff --git a/code/default/x_tunnel/local/tls_relay_front/ip_manager.py b/code/default/x_tunnel/local/tls_relay_front/ip_manager.py
@@ -1,4 +1,4 @@
-import random
+import time
 import json
 
 import utils
@@ -22,10 +22,12 @@ def _get_ip_info(self, ip):
             "fail_times": 0,
             "links": 0,
             "rtt": 1000,
+            "last_try": 0.0
         })
         return self.ip_dict[ip]
 
     def get_ip_sni_host(self):
+        now = time.time()
         ips = self.host_manager.ips
 
         best_info = None
@@ -39,7 +41,7 @@ def get_ip_sni_host(self):
             if info["links"] >= self.config.max_links_per_ip:
                 continue
 
-            if info["fail_times"] > 5 and random.randint(0, 10) < 9:
+            if info["fail_times"] and now - info["last_try"] < 60:
                 continue
 
             if info["rtt"] < best_rtt:
@@ -50,6 +52,7 @@ def get_ip_sni_host(self):
             return None, None, None
 
         best_info["links"] += 1
+        best_info["last_try"] = now
         # self.logger.debug("get ip:%s", ip)
 
         ip = best_info["ip"]
@@ -65,6 +68,7 @@ def update_ip(self, ip_str, sni, handshake_time):
         info = self._get_ip_info(ip)
         info["fail_times"] = 0
         info["rtt"] = handshake_time
+        info["last_try"] = 0.0
         # self.logger.debug("ip %s connect success", ip)
 
     def report_connect_fail(self, ip_str, sni=None, reason="", force_remove=False):