Changeset 2871 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

Aug 12, 2009 10:28:47 PM (15 years ago)

Author:

bennylp

Message:

Ticket #933: Incoming OPTIONS may trigger assertion if it arrives when PJSUA-LIB is being shutdown (thanks Johan Lantz for the report)

• destroy the media subsystem after busy_sleep(1000) in the shutdown sequence
• also handle the case when OPTIONS arrives just when PJSUA-LIB is being initialized and media transport is not ready (in this case just reply OPTIONS without message body)

File:

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

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

@@ -349 +349 @@
     }
 
-    /* Get media socket info */
-    pjmedia_transport_info_init(&tpinfo);
-    pjmedia_transport_get_info(pjsua_var.calls[0].med_tp, &tpinfo);
-
-    /* Add SDP body, using call0's RTP address */
-    status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, tdata->pool, 1,
-                                      &tpinfo.sock_info, &sdp);
-    if (status == PJ_SUCCESS) {
-        pjsip_create_sdp_body(tdata->pool, sdp, &tdata->msg->body);
+    /* Get media socket info, make sure transport is ready */
+    if (pjsua_var.calls[0].med_tp) {
+        pjmedia_transport_info_init(&tpinfo);
+        pjmedia_transport_get_info(pjsua_var.calls[0].med_tp, &tpinfo);
+
+        /* Add SDP body, using call0's RTP address */
+        status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, tdata->pool, 1,
+                                          &tpinfo.sock_info, &sdp);
+        if (status == PJ_SUCCESS) {
+            pjsip_create_sdp_body(tdata->pool, sdp, &tdata->msg->body);
+        }
     }
 
@@ -1249 +1251 @@
     }
 
-    /* Destroy media */
-    pjsua_media_subsys_destroy();
-
     /* Destroy endpoint. */
     if (pjsua_var.endpt) {
@@ -1273 +1272 @@
         PJ_LOG(4,(THIS_FILE, "Destroying..."));
 
+        /* Terminate all calls again, just in case there's new call
+         * picked up during busy_sleep()
+         */
+        pjsua_call_hangup_all();
+
+        /* Destroy media after all polling is done, as there may be
+         * incoming request that needs handling (e.g. OPTIONS)
+         */
+        pjsua_media_subsys_destroy();
+
         /* Must destroy endpoint first before destroying pools in
          * buddies or accounts, since shutting down transaction layer
@@ -1296 +1305 @@
             }
         }
+    } else {
+        /* Destroy media */
+        pjsua_media_subsys_destroy();
     }