diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-06-12 15:29:52 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-06-12 15:29:52 +0000 |
| commit | 73e426c3e8cc554c19b6e4ed13dc3aa354fc6526 (patch) | |
| tree | fb1254f1dd87c1b11c3a18e38940e9ec11c9f85e /pjsip | |
| parent | 1b00f8f27581a30feb5320367c3d6d9dda6b22e5 (diff) | |
Removed assertion when sending re-INVITE while another INVITE transaction is in progress (thanks Frank Niessen)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1365 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsip-ua/sip_inv.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c index 62d76d73..826fc87f 100644 --- a/pjsip/src/pjsip-ua/sip_inv.c +++ b/pjsip/src/pjsip-ua/sip_inv.c @@ -321,7 +321,7 @@ static pj_bool_t mod_inv_on_rx_response(pjsip_rx_data *rdata) inv->invite_tsx == NULL) { - inv_send_ack(inv, rdata); + //inv_send_ack(inv, rdata); return PJ_TRUE; } @@ -1586,7 +1586,8 @@ PJ_DEF(pj_status_t) pjsip_inv_reinvite( pjsip_inv_session *inv, PJ_ASSERT_RETURN(inv && p_tdata, PJ_EINVAL); /* Must NOT have a pending INVITE transaction */ - PJ_ASSERT_RETURN(inv->invite_tsx==NULL, PJ_EINVALIDOP); + if (inv->invite_tsx!=NULL) + return PJ_EINVALIDOP; pjsip_dlg_inc_lock(inv->dlg); @@ -2507,7 +2508,7 @@ static void inv_on_state_confirmed( pjsip_inv_session *inv, pjsip_event *e) e->body.tsx_state.src.rdata); /* Send ACK */ - inv_send_ack(inv, e->body.tsx_state.src.rdata); + //inv_send_ack(inv, e->body.tsx_state.src.rdata); } else if (tsx->state == PJSIP_TSX_STATE_COMPLETED && (tsx->status_code==401 || tsx->status_code==407)) |