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

Timestamp:

Apr 23, 2019 8:42:45 AM (4 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_tcp.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -693 +693 @@
     pj_grp_lock_add_handler(tcp->grp_lock, pool, tcp, &tcp_on_destroy);
 
+    tcp->base.grp_lock = tcp->grp_lock;
+
     /* Create active socket */
     pj_activesock_cfg_default(&asock_cfg);
@@ -747 +749 @@
 
 on_error:
-    tcp_destroy(&tcp->base, status);
+    if (tcp->grp_lock && pj_grp_lock_get_ref(tcp->grp_lock))
+        tcp_destroy(&tcp->base, status);
+    else
+        tcp_on_destroy(tcp);
+
     return status;
 }
@@ -868 +874 @@
         pj_grp_lock_dec_ref(grp_lock);
         /* Transport may have been deleted at this point */
-    } else {
-        tcp_on_destroy(tcp);
     }