kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Darcs sync 

Tue Feb 26 13:02:06 EST 2008  Pekka.Pessi@nokia.com
  * nua_session.c: determine INVITE overlap with re-INVITEs, too



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7743 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-02-26 18:05:58 +00:00
parent 82b1ba3eb2
commit 3ee1e1bc8f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
View File

@ -1854,9 +1854,8 @@ nua_invite_server_init(nua_server_request_t *sr)
nua_client_request_t const *cr;
for (sr0 = nh->nh_ds->ds_sr; sr0; sr0 = sr0->sr_next) {
/* Final response have not been sent to previous INVITE */
if (sr0->sr_method == sip_method_invite &&
nua_server_request_is_pending(sr0))
/* Previous INVITE has not been ACKed */
if (sr0->sr_method == sip_method_invite)
break;
/* Or we have sent offer but have not received an answer */
if (sr->sr_sdp && sr0->sr_offer_sent && !sr0->sr_answer_recv)
@ -1879,10 +1878,8 @@ nua_invite_server_init(nua_server_request_t *sr)
ss = nua_dialog_usage_private(sr->sr_usage);
if (ss->ss_state < nua_callstate_completed &&
if (ss->ss_state < nua_callstate_ready &&
ss->ss_state != nua_callstate_init) {
/* We should never trigger this,
but better not to assert() on network input */
return nua_server_retry_after(sr, 500, "Overlapping Requests 2", 0, 10);
}
}