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

Timestamp:

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

Author:

bennylp

Message:

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

File:

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

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);
         }