Changeset 5751 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

Mar 6, 2018 8:44:18 AM (7 years ago)

Author:

nanang

Message:

Fixed #2099: Fixed SSL socket (OpenSSL backend), when sending buffer is full, any further send operation should be rejected immediately without writing to OpenSSL SSL BIO.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c (modified) (6 diffs)

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

@@ -264 +264 @@
     pj_bool_t             flushing_write_pend; /* flag of flushing is ongoing*/
     send_buf_t            send_buf;
+    write_data_t          send_buf_pending; /* send buffer is full but some
+                                             * data is queuing in wbio.     */
     write_data_t          send_pending; /* list of pending write to network */
     pj_lock_t            *write_mutex;  /* protect write BIO and send_buf   */
@@ -1890 +1892 @@
     wdata = alloc_send_data(ssock, needed_len);
     if (wdata == NULL) {
+        /* Oops, write BIO is ready but the send buffer is full, let's just
+         * queue it for sending and return PJ_EPENDING.
+         */
+        ssock->send_buf_pending.data_len = needed_len;
+        ssock->send_buf_pending.app_key = send_key;
+        ssock->send_buf_pending.flags = flags;
+        ssock->send_buf_pending.plain_data_len = orig_len;
         pj_lock_release(ssock->write_mutex);
-        return PJ_ENOMEM;
+        return PJ_EPENDING;
     }
 
@@ -2193 +2202 @@
     pj_ssl_sock_t *ssock = (pj_ssl_sock_t*)
                            pj_activesock_get_user_data(asock);
-
-    PJ_UNUSED_ARG(send_key);
-    PJ_UNUSED_ARG(sent);
+    write_data_t *wdata = (write_data_t*)send_key->user_data;
+    pj_ioqueue_op_key_t *app_key = wdata->app_key;
+    pj_ssize_t sent_len;
+
+    sent_len = (sent > 0)? wdata->plain_data_len : sent;
+    
+    /* Update write buffer state */
+    pj_lock_acquire(ssock->write_mutex);
+    free_send_data(ssock, wdata);
+    pj_lock_release(ssock->write_mutex);
+    wdata = NULL;
 
     if (ssock->ssl_state == SSL_STATE_HANDSHAKING) {
@@ -2208 +2225 @@
     } else if (send_key != &ssock->handshake_op_key) {
         /* Some data has been sent, notify application */
-        write_data_t *wdata = (write_data_t*)send_key->user_data;
         if (ssock->param.cb.on_data_sent) {
             pj_bool_t ret;
-            pj_ssize_t sent_len;
-
-            sent_len = (sent > 0)? wdata->plain_data_len : sent;
-            ret = (*ssock->param.cb.on_data_sent)(ssock, wdata->app_key, 
+            ret = (*ssock->param.cb.on_data_sent)(ssock, app_key, 
                                                   sent_len);
             if (!ret) {
@@ -2221 +2234 @@
             }
         }
-
-        /* Update write buffer state */
-        pj_lock_acquire(ssock->write_mutex);
-        free_send_data(ssock, wdata);
-        pj_lock_release(ssock->write_mutex);
-
     } else {
         /* SSL re-negotiation is on-progress, just do nothing */
+    }
+
+    /* Send buffer has been updated, let's try to send any pending data */
+    if (ssock->send_buf_pending.data_len) {
+        pj_status_t status;
+        status = flush_write_bio(ssock, ssock->send_buf_pending.app_key,
+                                 ssock->send_buf_pending.plain_data_len,
+                                 ssock->send_buf_pending.flags);
+        if (status == PJ_SUCCESS || status == PJ_EPENDING) {
+            ssock->send_buf_pending.data_len = 0;
+        }
     }
 
@@ -2998 +3016 @@
      */
     pj_lock_acquire(ssock->write_mutex);
+    /* Don't write to SSL if send buffer is full and some data is in
+     * write BIO already, just return PJ_ENOMEM.
+     */
+    if (ssock->send_buf_pending.data_len) {
+        pj_lock_release(ssock->write_mutex);
+        return PJ_ENOMEM;
+    }
     nwritten = SSL_write(ssock->ossl_ssl, data, (int)size);
     pj_lock_release(ssock->write_mutex);