4.13.4 fix boringssl seg fail issue.

Author: Michael-X-Net

code/default/gae_proxy/local/check_local_network.py

@@ -23,6 +23,7 @@
 
 from gae_proxy.local.config import config
 
+import utils
 import simple_http_client
 from xlog import getLogger
 
@@ -190,7 +191,7 @@ def report_fail(ip):
 def is_ok(ip=None):
     if not ip:
         return IPv4.is_ok() or IPv6.is_ok()
-    elif "." in ip:
+    elif utils.check_ip_valid4(ip):
         return IPv4.is_ok()
     else:
         return IPv6.is_ok()

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

@@ -115,8 +115,16 @@ def x509_name_to_string(xname):
 
         try:
             cert = bssl.SSL_get_peer_certificate(self._connection)
+            if cert == ffi.NULL:
+                raise Exception("get cert failed")
+
             alt_names_p = bssl.get_alt_names(cert)
+            if alt_names_p == ffi.NULL:
+                raise Exception("get alt_names failed")
+
             alt_names = utils.to_str(ffi.string(alt_names_p))
+            bssl.free(alt_names_p)
+
             subject = x509_name_to_string(bssl.X509_get_subject_name(cert))
             issuer = x509_name_to_string(bssl.X509_get_issuer_name(cert))
             altName = alt_names.split(";")
@@ -139,15 +147,17 @@ def send(self, data, flags=0):
             ret = bssl.SSL_write(self._connection, data, len(data))
             return ret
         except Exception as e:
-            self.logger.exception("ssl send:%r", e)
+            self._context.logger.exception("ssl send:%r", e)
             raise e
 
     def recv(self, bufsiz, flags=0):
         buf = bytes(bufsiz)
         n = bssl.SSL_read(self._connection, buf, bufsiz)
         if n <= 0:
+            errno = bssl.SSL_get_error(self._connection, n)
+            self._context.logger.warn("recv errno: %d ip:%s", errno, self.ip_str)
             e = socket.error(2)
-            e.errno = 2
+            e.errno = errno
             raise e
 
         dat = buf[:n]
@@ -160,7 +170,11 @@ def recv_into(self, buf, nbytes=None):
         b = ffi.from_buffer(buf)
         n = bssl.SSL_read(self._connection, b, nbytes)
         if n <= 0:
-            return None
+            errno = bssl.SSL_get_error(self._connection, n)
+            self._context.logger.warn("recv_into errno: %d ip:%s", errno, self.ip_str)
+            e = socket.error(2)
+            e.errno = errno
+            raise e
 
         return n
 

code/default/lib/noarch/hyper/common/util.py

@@ -17,14 +17,14 @@ def to_bytestring(element):
     """
     if isinstance(element, bytes):
         return element
-    if isinstance(element, string_types):
-        return element.encode('utf-8')
-    elif isinstance(element, bytes):
-        return element
     elif isinstance(element, memoryview):
         return element.tobytes()
+    elif isinstance(element, bytes):
+        return element
     elif isinstance(element, int):
         return str(element)
+    if isinstance(element, string_types):
+        return element.encode('utf-8')
     else:
         raise ValueError("Non string type:%s" % type(element))
 

code/default/lib/tests/test_utils.py

@@ -23,3 +23,9 @@ def test_merge_dict(self):
             'b': 3,
             'c': 4
         })
+
+    def test_memory(self):
+        buf = bytearray(8)
+        mv = memoryview(buf)
+        mv3 = mv[3:]
+        print(len(mv3))

code/default/version.txt

@@ -1 +1 @@
-4.13.3
+4.13.4

code/default/x_tunnel/local/client.py

@@ -106,7 +106,7 @@ def load_config():
 
     # performance parameters
     # range 2 - 100
-    config.set_var("concurent_thread_num", 8)
+    config.set_var("concurent_thread_num", 20)
 
     # min roundtrip on road if connectoin exist
     config.set_var("min_on_road", 3)
@@ -121,7 +121,7 @@ def load_config():
     config.set_var("ack_delay", 300)
 
     # max 10M
-    config.set_var("max_payload", 1 * 64 * 1024)
+    config.set_var("max_payload", 256 * 1024)
 
     # range 1 - 30
     config.set_var("roundtrip_timeout", 25)