Changeset 4694 for pjproject/trunk

Timestamp:

Dec 17, 2013 9:01:21 AM (11 years ago)

Author:

nanang

Message:

Fixed #1717: Destroy media subsystem after all pollings/busy_sleep() are done, but leave deallocating media transport (via pjsua_media_channel_deinit()) before the pollings to allow clean TURN destroy.

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_core.c (modified) (3 diffs)
• pjsua_media.c (modified) (3 diffs)

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

@@ -1505 +1505 @@
         }
 
+        /* Deinit media channel of all calls (see #1717) */
+        for (i=0; i<(int)pjsua_var.ua_cfg.max_calls; ++i) {
+            /* TODO: check if we're not allowed to send to network in the
+             *       "flags", and if so do not do TURN allocation...
+             */
+            pjsua_media_channel_deinit(i);
+        }
+
         /* Set all accounts to offline */
         for (i=0; i<(int)PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
@@ -1515 +1523 @@
         /* Terminate all presence subscriptions. */
         pjsua_pres_shutdown(flags);
-
-        /* Destroy media (to shutdown media transports etc) */
-        pjsua_media_subsys_destroy(flags);
 
         /* Wait for sometime until all publish client sessions are done
@@ -1621 +1626 @@
 
         PJ_LOG(4,(THIS_FILE, "Destroying..."));
+
+        /* Destroy media (to shutdown media endpoint, etc) */
+        pjsua_media_subsys_destroy(flags);
 
         /* Must destroy endpoint first before destroying pools in

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

@@ -180 +180 @@
 pj_status_t pjsua_media_subsys_destroy(unsigned flags)
 {
-    unsigned i;
+    PJ_UNUSED_ARG(flags);
 
     PJ_LOG(4,(THIS_FILE, "Shutting down media.."));
@@ -192 +192 @@
     }
 
+#if 0
+    // This part has been moved out to pjsua_destroy() (see also #1717).
     /* Close media transports */
     for (i=0; i<pjsua_var.ua_cfg.max_calls; ++i) {
@@ -200 +202 @@
         pjsua_media_channel_deinit(i);
     }
+#endif
 
     /* Destroy media endpoint. */