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

Timestamp:

Sep 18, 2018 12:07:50 PM (6 years ago)

Author:

riza

Message:

Close #2150: Add new callback to notify when accept operation fails on TLS
listener.

File:

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

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

@@ -1710 +1710 @@
                       errmsg));
 
+            if (*ssock->param.cb.on_accept_complete2) {
+                (*ssock->param.cb.on_accept_complete2) 
+                      (ssock->parent, ssock, (pj_sockaddr_t*)&ssock->rem_addr, 
+                      pj_sockaddr_get_len((pj_sockaddr_t*)&ssock->rem_addr), 
+                      status);
+            }
+
             /* Originally, this is a workaround for ticket #985. However,
              * a race condition may occur in multiple worker threads
@@ -1749 +1756 @@
         }
         /* Notify application the newly accepted SSL socket */
-        if (ssock->param.cb.on_accept_complete) {
+        if (ssock->param.cb.on_accept_complete2) {
+            pj_bool_t ret;
+            ret = (*ssock->param.cb.on_accept_complete2) 
+                    (ssock->parent, ssock, (pj_sockaddr_t*)&ssock->rem_addr, 
+                    pj_sockaddr_get_len((pj_sockaddr_t*)&ssock->rem_addr), 
+                    status);
+            if (ret == PJ_FALSE)
+                return PJ_FALSE;        
+        } else if (ssock->param.cb.on_accept_complete) {
             pj_bool_t ret;
             ret = (*ssock->param.cb.on_accept_complete)
@@ -2520 +2535 @@
 
 
+static pj_bool_t asock_on_accept_complete2(pj_activesock_t *asock,
+                                           pj_sock_t newsock,
+                                           const pj_sockaddr_t *src_addr,
+                                           int src_addr_len,
+                                           pj_status_t status)
+{
+    pj_bool_t ret = PJ_TRUE;
+    if (status != PJ_SUCCESS) {
+        pj_ssl_sock_t *ssock = (pj_ssl_sock_t*)
+                        pj_activesock_get_user_data(asock);
+
+        if (ssock->param.cb.on_accept_complete2) {
+            (*ssock->param.cb.on_accept_complete2) (ssock->parent, ssock, 
+                                                    src_addr, src_addr_len, 
+                                                    status);
+        }
+    } else {
+        ret = asock_on_accept_complete(asock, newsock, src_addr, src_addr_len);
+    }
+    return ret;
+}
+
+
 static pj_bool_t asock_on_connect_complete (pj_activesock_t *asock,
                                             pj_status_t status)
@@ -3426 +3464 @@
 
     pj_bzero(&asock_cb, sizeof(asock_cb));
-    asock_cb.on_accept_complete = asock_on_accept_complete;
+    //asock_cb.on_accept_complete = asock_on_accept_complete;
+    asock_cb.on_accept_complete2 = asock_on_accept_complete2;
 
     status = pj_activesock_create(pool,