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

Timestamp:

Jun 19, 2014 9:42:02 AM (10 years ago)

Author:

nanang

Message:

Fix #1773: Added group lock to SIP transport to avoid race condition between transport callback and destroy.

File:

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

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

@@ -1694 +1694 @@
     asock_cfg.concurrency = ssock->param.concurrency;
     asock_cfg.whole_data = PJ_TRUE;
+    
+    /* If listener socket has group lock, automatically create group lock
+     * for the new socket.
+     */
+    if (ssock_parent->param.grp_lock) {
+        pj_grp_lock_t *glock;
+
+        status = pj_grp_lock_create(ssock->pool, NULL, &glock);
+        if (status != PJ_SUCCESS)
+            goto on_return;
+
+        /* Temporarily add ref the group lock until active socket creation,
+         * to make sure that group lock is destroyed if the active socket
+         * creation fails.
+         */
+        pj_grp_lock_add_ref(glock);
+        asock_cfg.grp_lock = ssock->param.grp_lock = glock;
+    }
 
     pj_bzero(&asock_cb, sizeof(asock_cb));
@@ -1707 +1725 @@
                                   ssock,
                                   &ssock->asock);
+
+    /* This will destroy the group lock if active socket creation fails */
+    if (asock_cfg.grp_lock) {
+        pj_grp_lock_dec_ref(asock_cfg.grp_lock);
+    }
 
     if (status != PJ_SUCCESS)
@@ -2122 +2145 @@
     /* Last known OpenSSL error code */
     info->last_native_err = ssock->last_err;
+
+    /* Group lock */
+    info->grp_lock = ssock->param.grp_lock;
 
     return PJ_SUCCESS;
@@ -2489 +2515 @@
     asock_cfg.concurrency = ssock->param.concurrency;
     asock_cfg.whole_data = PJ_TRUE;
+    asock_cfg.grp_lock = ssock->param.grp_lock;
 
     pj_bzero(&asock_cb, sizeof(asock_cb));
@@ -2575 +2602 @@
     asock_cfg.concurrency = ssock->param.concurrency;
     asock_cfg.whole_data = PJ_TRUE;
+    asock_cfg.grp_lock = ssock->param.grp_lock;
 
     pj_bzero(&asock_cb, sizeof(asock_cb));