Changeset 5000 for pjproject/trunk

Timestamp:

Mar 19, 2015 5:07:01 AM (10 years ago)

Author:

riza

Message:

Misc (re #1782): Check if the transport being shutdown in on_accept_complete and on_connect_complete callback

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_transport_tcp.c (modified) (5 diffs)
• sip_transport_tls.c (modified) (3 diffs)

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

@@ -1096 +1096 @@
     PJ_ASSERT_RETURN(sock != PJ_INVALID_SOCKET, PJ_TRUE);
 
+    if (!listener->is_registered)
+        return PJ_FALSE;
+
     PJ_LOG(4,(listener->factory.obj_name, 
               "TCP listener %.*s:%d: got incoming TCP connection "
@@ -1134 +1137 @@
             tcp_destroy(&tcp->base, status);
         } else {
+            if (tcp->base.is_shutdown || tcp->base.is_destroying) {
+                return PJ_TRUE;
+            }
             /* Start keep-alive timer */
             if (PJSIP_TCP_KEEP_ALIVE_INTERVAL) {
@@ -1143 +1149 @@
                 pj_gettimeofday(&tcp->last_activity);
             }
-
             /* Notify application of transport state accepted */
             state_cb = pjsip_tpmgr_get_state_cb(tcp->base.tpmgr);
             if (state_cb) {
                 pjsip_transport_state_info state_info;
-            
+
                 pj_bzero(&state_info, sizeof(state_info));
                 (*state_cb)(&tcp->base, PJSIP_TP_STATE_CONNECTED, &state_info);
@@ -1423 +1428 @@
     tcp->has_pending_connect = PJ_FALSE;
 
+    if (tcp->base.is_shutdown || tcp->base.is_destroying) 
+        return PJ_FALSE;
+
     /* Check connect() status */
     if (status != PJ_SUCCESS) {
@@ -1483 +1491 @@
     if (state_cb) {
         pjsip_transport_state_info state_info;
-    
+        
         pj_bzero(&state_info, sizeof(state_info));
         (*state_cb)(&tcp->base, PJSIP_TP_STATE_CONNECTED, &state_info);

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

@@ -1180 +1180 @@
     PJ_ASSERT_RETURN(new_ssock, PJ_TRUE);
 
+    if (!listener->is_registered)
+        return PJ_FALSE;
+
     PJ_LOG(4,(listener->factory.obj_name, 
               "TLS listener %.*s:%d: got incoming TLS connection "
@@ -1237 +1240 @@
         pjsip_transport_shutdown(&tls->base);
     }
-
     /* Notify transport state to application */
     state_cb = pjsip_tpmgr_get_state_cb(tls->base.tpmgr);
@@ -1555 +1557 @@
 
     tls = (struct tls_transport*) pj_ssl_sock_get_user_data(ssock);
+
+    if (tls->base.is_shutdown || tls->base.is_destroying) 
+        return PJ_FALSE;
 
     /* Check connect() status */