diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2014-10-27 07:36:08 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2014-10-27 07:36:08 +0000 |
| commit | 215516db90564f0f40675d7e8b0bdeead4866022 (patch) | |
| tree | d3396a638aaad80894d9f0936194d5277eb46c55 /pjsip/src/pjsua-lib/pjsua_acc.c | |
| parent | f190165c8f0660bb483d007996021f029b9931cb (diff) | |
Fix #1801:
- put error check in re-registration attempt in pjsua_acc_modify(),
- updated pjsua_acc_modify() docs about its behavior regarding unregistration and re-registration.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4955 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_acc.c')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_acc.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c index ac4cb303..8e49c8ba 100644 --- a/pjsip/src/pjsua-lib/pjsua_acc.c +++ b/pjsip/src/pjsua-lib/pjsua_acc.c @@ -1333,7 +1333,13 @@ PJ_DEF(pj_status_t) pjsua_acc_modify( pjsua_acc_id acc_id, /* Unregister first */ if (unreg_first) { - pjsua_acc_set_registration(acc->index, PJ_FALSE); + status = pjsua_acc_set_registration(acc->index, PJ_FALSE); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Ignored failure in unregistering the " + "old account setting in modifying account", status); + /* Not really sure if we should return error */ + status = PJ_SUCCESS; + } if (acc->regc != NULL) { pjsip_regc_destroy(acc->regc); acc->regc = NULL; @@ -1350,13 +1356,23 @@ PJ_DEF(pj_status_t) pjsua_acc_modify( pjsua_acc_id acc_id, /* Update registration */ if (update_reg) { /* If accounts has registration enabled, start registration */ - if (acc->cfg.reg_uri.slen) - pjsua_acc_set_registration(acc->index, PJ_TRUE); + if (acc->cfg.reg_uri.slen) { + status = pjsua_acc_set_registration(acc->index, PJ_TRUE); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Failed to register with new account " + "setting in modifying account", status); + goto on_return; + } + } } /* Update MWI subscription */ if (update_mwi) { - pjsua_start_mwi(acc_id, PJ_TRUE); + status = pjsua_start_mwi(acc_id, PJ_TRUE); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Failed in starting MWI subscription for " + "new account setting in modifying account", status); + } } on_return: |