Changeset 3830 for pjproject

Timestamp:

Oct 19, 2011 1:08:14 PM (13 years ago)

Author:

bennylp

Message:

Renamed enum names to comply with the spec in ticket (re #1216)

Location:

pjproject/branches/1.x

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (5 diffs)
• pjsip/src/pjsua-lib/pjsua_pres.c (modified) (3 diffs)

pjproject/branches/1.x/pjsip-apps/src/pjsua/pjsua_app.c

@@ -5119 +5119 @@
     }
 
-    status = pjsua_destroy2(1);
+    status = pjsua_destroy();
 
     pj_bzero(&app_config, sizeof(app_config));

pjproject/branches/1.x/pjsip/include/pjsua-lib/pjsua.h

@@ -1300 +1300 @@
 {
     /**
-     * Do not invoke any networking functions.
-     */
-    PJSUA_DESTROY_NO_NETWORK = 1
+     * Allow sending outgoing messages (such as unregistration, event
+     * unpublication, BYEs, unsubscription, etc.), but do not wait for
+     * responses. This is useful to perform "best effort" clean up
+     * without delaying the shutdown process waiting for responses.
+     */
+    PJSUA_DESTROY_NO_RX_MSG = 1,
+
+    /**
+     * If this flag is set, do not send any outgoing messages at all.
+     * This flag is useful if application knows that the network which
+     * the messages are to be sent on is currently down.
+     */
+    PJSUA_DESTROY_NO_TX_MSG = 2,
+
+    /**
+     * Do not send or receive messages during destroy. This flag is
+     * shorthand for  PJSUA_DESTROY_NO_RX_MSG + PJSUA_DESTROY_NO_TX_MSG.
+     */
+    PJSUA_DESTROY_NO_NETWORK = PJSUA_DESTROY_NO_RX_MSG |
+                               PJSUA_DESTROY_NO_TX_MSG
 
 } pjsua_destroy_flag;

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

@@ -1306 +1306 @@
 
         /* Terminate all calls. */
-        if ((flags & PJSUA_DESTROY_NO_NETWORK) == 0) {
+        if ((flags & PJSUA_DESTROY_NO_TX_MSG) == 0) {
             pjsua_call_hangup_all();
         }
@@ -1336 +1336 @@
         }
         
-        /* No need to wait if we didn't send anything */
-        if (flags & PJSUA_DESTROY_NO_NETWORK) {
+        /* No waiting if RX is disabled */
+        if (flags & PJSUA_DESTROY_NO_RX_MSG) {
             max_wait = 0;
         }
@@ -1370 +1370 @@
                 continue;
 
-            if (pjsua_var.acc[i].regc && (flags & PJSUA_DESTROY_NO_NETWORK)==0)
+            if (pjsua_var.acc[i].regc && (flags & PJSUA_DESTROY_NO_TX_MSG)==0)
             {
                 pjsua_acc_set_registration(i, PJ_FALSE);
@@ -1396 +1396 @@
         }
         
-        /* No need to wait if we didn't send anything */
-        if (flags & PJSUA_DESTROY_NO_NETWORK) {
+        /* No waiting if RX is disabled */
+        if (flags & PJSUA_DESTROY_NO_RX_MSG) {
             max_wait = 0;
         }
@@ -1421 +1421 @@
          * transports shutdown to complete: 
          */
-        if (i < 20 && (flags & PJSUA_DESTROY_NO_NETWORK) == 0) {
+        if (i < 20 && (flags & PJSUA_DESTROY_NO_RX_MSG) == 0) {
             busy_sleep(1000 - i*50);
         }

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

@@ -1285 +1285 @@
         acc->online_status = PJ_FALSE;
 
-        if ((flags & PJSUA_DESTROY_NO_NETWORK) == 0) {
+        if ((flags & PJSUA_DESTROY_NO_TX_MSG) == 0) {
             send_publish(acc->index, PJ_FALSE);
         }
@@ -1323 +1323 @@
         pjsip_pres_set_status(uapres->sub, &pres_status);
 
-        if ((flags & PJSUA_DESTROY_NO_NETWORK) == 0) {
+        if ((flags & PJSUA_DESTROY_NO_TX_MSG) == 0) {
             if (pjsip_pres_notify(uapres->sub,
                                   PJSIP_EVSUB_STATE_TERMINATED, NULL,
@@ -2282 +2282 @@
     }
 
-    if ((flags & PJSUA_DESTROY_NO_NETWORK) == 0) {
+    if ((flags & PJSUA_DESTROY_NO_TX_MSG) == 0) {
         refresh_client_subscriptions();