diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2012-04-12 08:10:06 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2012-04-12 08:10:06 +0000 |
| commit | 1077e0cb673a51daf937d5ef6e96fb88e7e52495 (patch) | |
| tree | 270aef14d69aa97c95705d1bc1f3a238368221a5 /pjsip/src | |
| parent | 693ebfcee09d2af61bd8e9d8ee27c3b4439306fc (diff) | |
Re #1474: merged r4039
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4040 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_acc.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c index 5182ef56..75cc07d9 100644 --- a/pjsip/src/pjsua-lib/pjsua_acc.c +++ b/pjsip/src/pjsua-lib/pjsua_acc.c @@ -421,13 +421,6 @@ PJ_DEF(pj_status_t) pjsua_acc_add( const pjsua_acc_config *cfg, } } - /* Get CRC of account proxy setting */ - acc->local_route_crc = calc_proxy_crc(acc->cfg.proxy, acc->cfg.proxy_cnt); - - /* Get CRC of global outbound proxy setting */ - acc->global_route_crc=calc_proxy_crc(pjsua_var.ua_cfg.outbound_proxy, - pjsua_var.ua_cfg.outbound_proxy_cnt); - /* Check the route URI's and force loose route if required */ for (i=0; i<acc->cfg.proxy_cnt; ++i) { status = normalize_route_uri(acc->pool, &acc->cfg.proxy[i]); @@ -438,6 +431,13 @@ PJ_DEF(pj_status_t) pjsua_acc_add( const pjsua_acc_config *cfg, } } + /* Get CRC of account proxy setting */ + acc->local_route_crc = calc_proxy_crc(acc->cfg.proxy, acc->cfg.proxy_cnt); + + /* Get CRC of global outbound proxy setting */ + acc->global_route_crc=calc_proxy_crc(pjsua_var.ua_cfg.outbound_proxy, + pjsua_var.ua_cfg.outbound_proxy_cnt); + status = initialize_acc(id); if (status != PJ_SUCCESS) { pjsua_perror(THIS_FILE, "Error adding account", status); @@ -772,6 +772,9 @@ PJ_DEF(pj_status_t) pjsua_acc_modify( pjsua_acc_id acc_id, pj_list_push_back(&local_route, r); } + + /* Recalculate the CRC again after route URI normalization */ + local_route_crc = calc_proxy_crc(acc_proxy, cfg->proxy_cnt); } |