Changeset 923 for pjproject

Timestamp:

Feb 1, 2007 3:37:11 AM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #84: pjsua_transport_close() doesn't properly close transport (especially TLS)

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -1285 +1285 @@
                                            pj_bool_t force )
 {
+    pj_status_t status;
+
     /* Make sure id is in range. */
     PJ_ASSERT_RETURN(id>=0 && id<PJ_ARRAY_SIZE(pjsua_var.tpdata), PJ_EINVAL);
@@ -1297 +1299 @@
         switch (pjsua_var.tpdata[id].type) {
         case PJSIP_TRANSPORT_UDP:
-            return pjsip_transport_destroy(pjsua_var.tpdata[id].data.tp);
+            status = pjsip_transport_shutdown(pjsua_var.tpdata[id].data.tp);
+            if (status  != PJ_SUCCESS)
+                return status;
+            status = pjsip_transport_destroy(pjsua_var.tpdata[id].data.tp);
+            if (status != PJ_SUCCESS)
+                return status;
+            break;
+
+        case PJSIP_TRANSPORT_TLS:
         case PJSIP_TRANSPORT_TCP:
+            /* This will close the TCP listener, but existing TCP/TLS
+             * connections (if any) will still linger 
+             */
+            status = (*pjsua_var.tpdata[id].data.factory->destroy)
+                        (pjsua_var.tpdata[id].data.factory);
+            if (status != PJ_SUCCESS)
+                return status;
+
             break;
+
         default:
-            break;
+            return PJ_EINVAL;
         }
         
     } else {
+        /* If force is not specified, transports will be closed at their
+         * convenient time. However this will leak PJSUA-API transport
+         * descriptors as PJSUA-API wouldn't know when exactly the
+         * transport is closed thus it can't cleanup PJSUA transport
+         * descriptor.
+         */
         switch (pjsua_var.tpdata[id].type) {
         case PJSIP_TRANSPORT_UDP:
             return pjsip_transport_shutdown(pjsua_var.tpdata[id].data.tp);
+        case PJSIP_TRANSPORT_TLS:
         case PJSIP_TRANSPORT_TCP:
             return (*pjsua_var.tpdata[id].data.factory->destroy)
                         (pjsua_var.tpdata[id].data.factory);
         default:
-            break;
-        }
-    }
-
-    /* Unreachable */
-    pj_assert(!"Unknown transport");
-    return PJ_EINVALIDOP;
+            return PJ_EINVAL;
+        }
+    }
+
+    /* Cleanup pjsua data when force is applied */
+    if (force) {
+        pjsua_var.tpdata[id].type = PJSIP_TRANSPORT_UNSPECIFIED;
+        pjsua_var.tpdata[id].data.ptr = NULL;
+    }
+
+    return PJ_SUCCESS;
 }