Changeset 4661

Timestamp:

Nov 29, 2013 12:33:05 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1714: Workaround for stuck in TCP/TLS shutdown when another thread is destroying the transport

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_transport_tcp.c (modified) (2 diffs)
• sip_transport_tls.c (modified) (2 diffs)

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

@@ -177 +177 @@
         tcp->close_reason = status;
 
-    if (tcp->base.is_shutdown)
+    if (tcp->base.is_shutdown || tcp->base.is_destroying)
         return;
 
@@ -195 +195 @@
         (*state_cb)(&tcp->base, PJSIP_TP_STATE_DISCONNECTED, &state_info);
     }
+
+    /* check again */
+    if (tcp->base.is_shutdown || tcp->base.is_destroying)
+        return;
 
     /* We can not destroy the transport since high level objects may

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

@@ -184 +184 @@
         tls->close_reason = status;
 
-    if (tls->base.is_shutdown)
+    if (tls->base.is_shutdown || tls->base.is_destroying)
         return;
 
@@ -214 +214 @@
         (*state_cb)(&tls->base, PJSIP_TP_STATE_DISCONNECTED, &state_info);
     }
+
+    /* check again */
+    if (tls->base.is_shutdown || tls->base.is_destroying)
+        return;
 
     /* We can not destroy the transport since high level objects may