Changeset 5971 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

Timestamp:

Apr 23, 2019 8:42:45 AM (5 years ago)

Author:

nanang

Message:

Fixed #2191:

• Stricter double timer entry scheduling prevention.
• Integrate group lock in SIP transport, e.g: for add/dec ref, for timer scheduling.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -164 +164 @@
                               const pj_str_t *remote_name,
                               struct tls_transport **p_tls);
+
+
+/* Clean up TLS resources */
+static void tls_on_destroy(void *arg);
 
 
@@ -894 +898 @@
 
 on_error:
-    tls_destroy(&tls->base, status);
+    if (tls->grp_lock && pj_grp_lock_get_ref(tls->grp_lock))
+        tls_destroy(&tls->base, status);
+    else
+        tls_on_destroy(tls);
+
     return status;
 }
@@ -1049 +1057 @@
         pj_grp_lock_dec_ref(grp_lock);
         /* Transport may have been deleted at this point */
-    } else {
-        tls_on_destroy(tls);
     }
 
@@ -1236 +1242 @@
 
     /* Set up the group lock */
-    tls->grp_lock = glock;
+    tls->grp_lock = tls->base.grp_lock = glock;
     pj_grp_lock_add_ref(tls->grp_lock);
     pj_grp_lock_add_handler(tls->grp_lock, pool, tls, &tls_on_destroy);