Changeset 6004 for pjproject/trunk/pjlib/src/pj/ssl_sock_imp_common.c

Timestamp:

May 24, 2019 3:32:17 AM (5 years ago)

Author:

riza

Message:

Close #1017: TURN TLS transport implementation.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_imp_common.c (modified) (7 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_imp_common.c

@@ -31 +31 @@
 #   define PJ_SSL_SOCK_DELAYED_CLOSE_TIMEOUT    500
 #endif
+
+enum { MAX_BIND_RETRY = 100 };
 
 #ifdef SSL_SOCK_IMP_USE_CIRC_BUF
@@ -597 +599 @@
 }
 
-
-static void wipe_buf(pj_str_t *buf)
-{
-    volatile char *p = buf->ptr;
-    pj_ssize_t len = buf->slen;
-    while (len--) *p++ = 0;
-    buf->slen = 0;
-}
-
-static void wipe_cert_buffer(pj_ssl_cert_t *cert)
-{
-    wipe_buf(&cert->CA_file);
-    wipe_buf(&cert->CA_path);
-    wipe_buf(&cert->cert_file);
-    wipe_buf(&cert->privkey_file);
-    wipe_buf(&cert->privkey_pass);
-    wipe_buf(&cert->CA_buf);
-    wipe_buf(&cert->cert_buf);
-    wipe_buf(&cert->privkey_buf);
-}
-
 static void ssl_on_destroy(void *arg)
 {
@@ -633 +614 @@
         ssock->circ_buf_output_mutex = NULL;
         ssock->write_mutex = NULL;
-    }
-
-    /* Wipe out cert & key buffer, note that they may not be allocated
-     * using SSL socket memory pool.
-     */
-    if (ssock->cert) {
-        wipe_cert_buffer(ssock->cert);
     }
 
@@ -1363 +1337 @@
 
     ssl_reset_sock_state(ssock);
+
+    /* Wipe out cert & key buffer. */
+    if (ssock->cert) {
+        pj_ssl_cert_wipe_keys(ssock->cert);
+        ssock->cert = NULL;
+    }
+
     if (ssock->param.grp_lock) {
         pj_grp_lock_dec_ref(ssock->param.grp_lock);
@@ -1883 +1864 @@
  * Starts asynchronous socket connect() operation.
  */
-PJ_DEF(pj_status_t) pj_ssl_sock_start_connect( pj_ssl_sock_t *ssock,
-                                               pj_pool_t *pool,
-                                               const pj_sockaddr_t *localaddr,
-                                               const pj_sockaddr_t *remaddr,
-                                               int addr_len)
+PJ_DEF(pj_status_t) pj_ssl_sock_start_connect(pj_ssl_sock_t *ssock,
+                                              pj_pool_t *pool,
+                                              const pj_sockaddr_t *localaddr,
+                                              const pj_sockaddr_t *remaddr,
+                                              int addr_len)
+{
+    pj_ssl_start_connect_param param;    
+    param.pool = pool;
+    param.localaddr = localaddr;
+    param.local_port_range = 0;
+    param.remaddr = remaddr;
+    param.addr_len = addr_len;
+
+    return pj_ssl_sock_start_connect2(ssock, &param);
+}
+
+PJ_DEF(pj_status_t) pj_ssl_sock_start_connect2(
+                               pj_ssl_sock_t *ssock,
+                               pj_ssl_start_connect_param *connect_param)
 {
     pj_activesock_cb asock_cb;
     pj_activesock_cfg asock_cfg;
     pj_status_t status;
+    
+    pj_pool_t *pool = connect_param->pool;
+    const pj_sockaddr_t *localaddr = connect_param->localaddr;
+    pj_uint16_t port_range = connect_param->local_port_range;
+    const pj_sockaddr_t *remaddr = connect_param->remaddr;
+    int addr_len = connect_param->addr_len;
 
     PJ_ASSERT_RETURN(ssock && pool && localaddr && remaddr && addr_len,
@@ -1919 +1920 @@
 
     /* Bind socket */
-    status = pj_sock_bind(ssock->sock, localaddr, addr_len);
+    if (port_range) {
+        pj_uint16_t max_bind_retry = MAX_BIND_RETRY;
+        if (port_range && port_range < max_bind_retry)
+        {
+            max_bind_retry = port_range;
+        }
+        status = pj_sock_bind_random(ssock->sock, localaddr, port_range,
+                                     max_bind_retry);
+    } else {
+        status = pj_sock_bind(ssock->sock, localaddr, addr_len);
+    }
+
     if (status != PJ_SUCCESS)
         goto on_error;
@@ -2013 +2025 @@
 }
 
+static void wipe_buf(pj_str_t *buf)
+{
+    volatile char *p = buf->ptr;
+    pj_ssize_t len = buf->slen;
+    while (len--) *p++ = 0;
+    buf->slen = 0;
+}
+
+PJ_DEF(void) pj_ssl_cert_wipe_keys(pj_ssl_cert_t *cert)
+{    
+    if (cert) {
+        wipe_buf(&cert->CA_file);
+        wipe_buf(&cert->CA_path);
+        wipe_buf(&cert->cert_file);
+        wipe_buf(&cert->privkey_file);
+        wipe_buf(&cert->privkey_pass);
+        wipe_buf(&cert->CA_buf);
+        wipe_buf(&cert->cert_buf);
+        wipe_buf(&cert->privkey_buf);
+    }
+}
+
 /* Load credentials from files. */
 PJ_DEF(pj_status_t) pj_ssl_cert_load_from_files (pj_pool_t *pool,