Changeset 5200

Timestamp:

Nov 16, 2015 4:42:42 AM (8 years ago)

Author:

nanang

Message:

Fix #1898: If transport is being shutdown/destroyed and connected event comes, proceed as error/cancelled connect.

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_transport_tcp.c (modified) (1 diff)
• sip_transport_tls.c (modified) (1 diff)

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

@@ -1471 +1471 @@
     tcp->has_pending_connect = PJ_FALSE;
 
-    if (tcp->base.is_shutdown || tcp->base.is_destroying) 
-        return PJ_FALSE;
+    /* If transport is being shutdown/destroyed, proceed as error connect.
+     * Note that it is important to notify application via on_data_sent()
+     * as otherwise the transport reference counter may never reach zero
+     * (see #1898).
+     */
+    if ((tcp->base.is_shutdown || tcp->base.is_destroying) &&
+        status == PJ_SUCCESS)
+    {
+        status = PJ_ECANCELLED;
+    }
 
     /* Check connect() status */

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

@@ -1567 +1567 @@
     tls = (struct tls_transport*) pj_ssl_sock_get_user_data(ssock);
 
-    if (tls->base.is_shutdown || tls->base.is_destroying) 
-        return PJ_FALSE;
+    /* If transport is being shutdown/destroyed, proceed as error connect.
+     * Note that it is important to notify application via on_data_sent()
+     * as otherwise the transport reference counter may never reach zero
+     * (see #1898).
+     */
+    if ((tls->base.is_shutdown || tls->base.is_destroying) &&
+        status == PJ_SUCCESS)
+    {
+        status = PJ_ECANCELLED;
+    }
 
     /* Check connect() status */