3.7.13, fix bug not remove bad ip.

Llq201809 · Nov 9, 2017 · cbc4523 · cbc4523
1 parent 9f3a917
commit cbc4523
Show file tree

Hide file tree

Showing 18 changed files with 367 additions and 350 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 | 稳定性| 部分地区不稳定 | 稳定可用 |
 | 速度 | 流畅 | 下载快速，偶尔卡顿 | 
 | 安全性| Google可看到通信内容 |  完全加密 |  
-| 易用 | 需扫描ip，部署服务端，导入证书 | 简单  |
+| 易用 | 需开启Ipv6，部署服务端，导入证书 | 简单  |
 | 兼容性| 部分网站不支持 | 无问题 |
 | 收费  | 免费 | 付费 |  
 
@@ -22,10 +22,10 @@
 
 
 ### 最新状态：
- 2017-11-8
+ 2017-11-9
 * X-Tunnel 稳定. （[使用教程](https://github.com/XX-net/XX-Net/wiki/x-tunnel%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B)）  
 
-* GAE:  请升级到 3.7.12， 扫不到ip，请开启ipv6，请参考：
+* GAE:  请升级到 3.7.13， 扫不到ip，请开启ipv6，请参考：
   [如何开启IPv6](https://github.com/XX-net/XX-Net/wiki/%E5%A6%82%E4%BD%95%E5%BC%80%E5%90%AFIPv6)
 
 

diff --git a/code/default/download.md b/code/default/download.md
@@ -5,7 +5,7 @@ https://codeload.github.com/XX-net/XX-Net/zip/3.7.9
 
 
 测试版(Test)：  
-https://codeload.github.com/XX-net/XX-Net/zip/3.7.12
+https://codeload.github.com/XX-net/XX-Net/zip/3.7.13
 
 
 Android:  

diff --git a/code/default/gae_proxy/ipv6_tunnel/switch.py b/code/default/gae_proxy/ipv6_tunnel/switch.py
diff --git a/code/default/gae_proxy/ipv6_tunnel/win32/IPV6_note.TXT b/code/default/gae_proxy/ipv6_tunnel/win32/IPV6_note.TXT
diff --git a/code/default/gae_proxy/ipv6_tunnel/win32/disable_ipv6.bat b/code/default/gae_proxy/ipv6_tunnel/win32/disable_ipv6.bat
diff --git a/code/default/gae_proxy/ipv6_tunnel/win32/enable_ipv6.bat b/code/default/gae_proxy/ipv6_tunnel/win32/enable_ipv6.bat
diff --git a/code/default/gae_proxy/local/check_local_network.py b/code/default/gae_proxy/local/check_local_network.py
@@ -31,9 +31,6 @@
 max_timeout = 5
 
 
-#####################################
-
-
 class CheckNetwork(object):
     def __init__(self, type="IPv4"):
         self.type = type
@@ -53,7 +50,6 @@ def __init__(self, type="IPv4"):
 
         self.http_client = simple_http_client.Client(self.proxy, timeout=30)
 
-
     def report_ok(self):
         self.network_stat = "OK"
         self.last_check_time = time.time()
@@ -79,7 +75,6 @@ def is_ok(self):
 
     def _test_host(self, url):
         try:
-
             header = {
                 "user-agent": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Safari/537.36",
                 "accept": "application/json, text/javascript, */*; q=0.01",
@@ -135,7 +130,7 @@ def _triger_check_network(self, fail=False, force=False):
                 if time_now - self.last_check_time < 10:
                     return
 
-                self.last_check_time = time_now
+        self.last_check_time = time_now
         threading.Thread(target=self._simple_check_worker).start()
 
 
@@ -168,9 +163,9 @@ def report_fail(ip):
 
 def is_ok(ip):
     if "." in ip:
-        IPv4.is_ok()
+        return IPv4.is_ok()
     else:
-        IPv6.is_ok()
+        return IPv6.is_ok()
 
 
 if __name__ == "__main__":