diff options
| author | Benny Prijono <bennylp@teluu.com> | 2011-10-19 13:08:14 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2011-10-19 13:08:14 +0000 |
| commit | 383aba12a88e5df34ded72dfd7272291be7518d4 (patch) | |
| tree | 6cc714a17901cd83abf43fc7cf3f5089f1eabb65 /pjsip/src/pjsua-lib/pjsua_core.c | |
| parent | 4b65d7d166b1318f34e35b0db62b7533a36c6c80 (diff) | |
Renamed enum names to comply with the spec in ticket (re #1216)
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@3830 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_core.c')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 6274f4d4..9b7c4a16 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -1305,7 +1305,7 @@ PJ_DEF(pj_status_t) pjsua_destroy2(unsigned flags) PJ_LOG(4,(THIS_FILE, "Shutting down, flags=%d...", flags)); /* Terminate all calls. */ - if ((flags & PJSUA_DESTROY_NO_NETWORK) == 0) { + if ((flags & PJSUA_DESTROY_NO_TX_MSG) == 0) { pjsua_call_hangup_all(); } @@ -1335,8 +1335,8 @@ PJ_DEF(pj_status_t) pjsua_destroy2(unsigned flags) max_wait = pjsua_var.acc[i].cfg.unpublish_max_wait_time_msec; } - /* 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; } @@ -1369,7 +1369,7 @@ PJ_DEF(pj_status_t) pjsua_destroy2(unsigned flags) if (!pjsua_var.acc[i].valid) 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); } @@ -1395,8 +1395,8 @@ PJ_DEF(pj_status_t) pjsua_destroy2(unsigned flags) max_wait = pjsua_var.acc[i].cfg.unreg_timeout; } - /* 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; } @@ -1420,7 +1420,7 @@ PJ_DEF(pj_status_t) pjsua_destroy2(unsigned flags) /* Wait for some time to allow unregistration and ICE/TURN * 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); } |