Author: mikej Date: Tue Feb 26 13:05:58 2008 New Revision: 7743 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Log: Darcs sync Tue Feb 26 13:02:06 EST 2008 Pekka.Pessi@nokia.com * nua_session.c: determine INVITE overlap with re-INVITEs, too Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Tue Feb 26 13:05:58 2008 @@ -1854,9 +1854,8 @@ 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 @@ 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); } }