Changeset 3829 for pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

Oct 19, 2011 12:45:05 PM (13 years ago)

Author:

bennylp

Message:

Fixed #1216: New pjsua_destroy2() API to allow shutting down the library without sending any outgoing messages

File:

• pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_core.c (modified) (8 diffs)

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_core.c

@@ -1284 +1284 @@
  * Destroy pjsua.
  */
-PJ_DEF(pj_status_t) pjsua_destroy(void)
+PJ_DEF(pj_status_t) pjsua_destroy2(unsigned flags)
 {
     int i;  /* Must be signed */
@@ -1303 +1303 @@
         unsigned max_wait;
 
-        PJ_LOG(4,(THIS_FILE, "Shutting down..."));
+        PJ_LOG(4,(THIS_FILE, "Shutting down, flags=%d...", flags));
 
         /* Terminate all calls. */
-        pjsua_call_hangup_all();
+        if ((flags & PJSUA_DESTROY_NO_NETWORK) == 0) {
+            pjsua_call_hangup_all();
+        }
 
         /* Set all accounts to offline */
@@ -1317 +1319 @@
 
         /* Terminate all presence subscriptions. */
-        pjsua_pres_shutdown();
+        pjsua_pres_shutdown(flags);
 
         /* Destroy media (to shutdown media transports etc) */
-        pjsua_media_subsys_destroy();
+        pjsua_media_subsys_destroy(flags);
 
         /* Wait for sometime until all publish client sessions are done
@@ -1334 +1336 @@
         }
         
+        /* No need to wait if we didn't send anything */
+        if (flags & PJSUA_DESTROY_NO_NETWORK) {
+            max_wait = 0;
+        }
+
         /* Second stage, wait for unpublications to complete */
         for (i=0; i<(int)(max_wait/50); ++i) {
@@ -1363 +1370 @@
                 continue;
 
-            if (pjsua_var.acc[i].regc) {
+            if (pjsua_var.acc[i].regc && (flags & PJSUA_DESTROY_NO_NETWORK)==0)
+            {
                 pjsua_acc_set_registration(i, PJ_FALSE);
             }
@@ -1388 +1396 @@
         }
         
+        /* No need to wait if we didn't send anything */
+        if (flags & PJSUA_DESTROY_NO_NETWORK) {
+            max_wait = 0;
+        }
+
         /* Second stage, wait for unregistrations to complete */
         for (i=0; i<(int)(max_wait/50); ++i) {
@@ -1408 +1421 @@
          * transports shutdown to complete: 
          */
-        if (i < 20)
+        if (i < 20 && (flags & PJSUA_DESTROY_NO_NETWORK) == 0) {
             busy_sleep(1000 - i*50);
+        }
 
         PJ_LOG(4,(THIS_FILE, "Destroying..."));
@@ -1467 +1481 @@
     /* Done. */
     return PJ_SUCCESS;
+}
+
+
+PJ_DEF(pj_status_t) pjsua_destroy(void)
+{
+    return pjsua_destroy2(0);
 }