diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2012-04-23 10:22:49 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2012-04-23 10:22:49 +0000 |
| commit | 2db9d089de673881d22d091b2dea3b7dcafa0eca (patch) | |
| tree | 3790be4f3f5912e07db48c8a0e7e610124f6d655 /pjsip | |
| parent | 60adef06227a00845984b882d0f34e644399a03a (diff) | |
Re #1417: Fixed error handling if pjsip_timer_init_session() when accepting incoming call and fixed typo in assertion in sip_inv.c
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@4067 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsip-ua/sip_inv.c | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_call.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c index 550300ca..c1a566f5 100644 --- a/pjsip/src/pjsip-ua/sip_inv.c +++ b/pjsip/src/pjsip-ua/sip_inv.c @@ -2159,7 +2159,7 @@ PJ_DEF(pj_status_t) pjsip_inv_end_session( pjsip_inv_session *inv, return PJSIP_ESESSIONTERMINATED; default: - pj_assert("!Invalid operation!"); + pj_assert(!"Invalid operation!"); return PJ_EINVALIDOP; } diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index 414cb8da..434bbee4 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -971,10 +971,8 @@ pj_bool_t pjsua_call_on_incoming(pjsip_rx_data *rdata) &pjsua_var.acc[acc_id].cfg.timer_setting); if (status != PJ_SUCCESS) { pjsua_perror(THIS_FILE, "Session Timer init failed", status); - status = pjsip_inv_end_session(inv, PJSIP_SC_INTERNAL_SERVER_ERROR, - NULL, &response); - if (status == PJ_SUCCESS && response) - status = pjsip_inv_send_msg(inv, response); + pjsip_dlg_respond(dlg, rdata, PJSIP_SC_INTERNAL_SERVER_ERROR, NULL, NULL, NULL); + pjsip_inv_terminate(inv, PJSIP_SC_INTERNAL_SERVER_ERROR, PJ_FALSE); pjsua_media_channel_deinit(call->index); |