diff options
author | Liong Sauw Ming <ming@teluu.com> | 2011-10-31 10:31:23 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2011-10-31 10:31:23 +0000 |
commit | 5d2066e0c3368cce23090e842c407a35bc351a83 (patch) | |
tree | c188d02e9322edef6defc9161d8cb26a736108ba /pjsip/src/pjsua-lib | |
parent | d63fe414b41e56ccdcb45f6924e60cdc8a2ad3a4 (diff) |
Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk
* Backport of r3833:r3877
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3878 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib')
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_acc.c | 10 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 8 |
2 files changed, 16 insertions, 2 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c index bd8096a3..24df6e01 100644 --- a/pjsip/src/pjsua-lib/pjsua_acc.c +++ b/pjsip/src/pjsua-lib/pjsua_acc.c @@ -895,6 +895,12 @@ PJ_DEF(pj_status_t) pjsua_acc_modify( pjsua_acc_id acc_id, acc->cfg.use_stream_ka = cfg->use_stream_ka; #endif + /* Use of proxy */ + if (acc->cfg.reg_use_proxy != cfg->reg_use_proxy) { + acc->cfg.reg_use_proxy = cfg->reg_use_proxy; + update_reg = PJ_TRUE; + } + /* Global outbound proxy */ if (global_route_crc != acc->global_route_crc) { unsigned i, rcnt; @@ -1005,6 +1011,7 @@ PJ_DEF(pj_status_t) pjsua_acc_modify( pjsua_acc_id acc_id, acc->cfg.reg_retry_interval = cfg->reg_retry_interval; acc->cfg.reg_first_retry_interval = cfg->reg_first_retry_interval; acc->cfg.drop_calls_on_reg_fail = cfg->drop_calls_on_reg_fail; + acc->cfg.register_on_acc_add = cfg->register_on_acc_add; if (acc->cfg.reg_delay_before_refresh != cfg->reg_delay_before_refresh) { acc->cfg.reg_delay_before_refresh = cfg->reg_delay_before_refresh; pjsip_regc_set_delay_before_refresh(acc->regc, @@ -1068,6 +1075,9 @@ PJ_DEF(pj_status_t) pjsua_acc_modify( pjsua_acc_id acc_id, acc->cfg.vid_cap_dev = cfg->vid_cap_dev; acc->cfg.vid_rend_dev = cfg->vid_rend_dev; + /* Call hold type */ + acc->cfg.call_hold_type = cfg->call_hold_type; + on_return: PJSUA_UNLOCK(); pj_log_pop_indent(); diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 52054226..6a80380c 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -1321,8 +1321,12 @@ pj_status_t resolve_stun_server(pj_bool_t wait) * result. */ if (wait) { - while (pjsua_var.stun_status == PJ_EPENDING) - pjsua_handle_events(10); + while (pjsua_var.stun_status == PJ_EPENDING) { + if (pjsua_var.thread[0] == NULL) + pjsua_handle_events(10); + else + pj_thread_sleep(10); + } } } |