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

Wed May 7 10:04:14 EDT 2008 Pekka Pessi <first.last@nokia.com> 

* nua_session.c: do not terminate session without soa if SDP O/A seems to fail
  
  SDP O/A may be buried inside MIME multipart



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8333 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-05-09 17:43:16 +00:00
parent f39b423778
commit 3ee862d73f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Fri May 9 13:42:29 EDT 2008
Fri May 9 13:43:01 EDT 2008

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

@ -1293,7 +1293,9 @@ int nua_invite_client_ack(nua_client_request_t *cr, tagi_t const *tags)
/* signal SOA that O/A round(s) is (are) complete */
soa_activate(nh->nh_soa, NULL);
}
else if (nh->nh_soa == NULL && !(cr->cr_offer_sent && !cr->cr_answer_recv)) {
else if (nh->nh_soa == NULL
/* NUA does not necessarily know dirty details */
/* && !(cr->cr_offer_sent && !cr->cr_answer_recv) */) {
;
}
else {
@ -3135,17 +3137,15 @@ static int nua_update_client_request(nua_client_request_t *cr,
(sr->sr_offer_recv && !sr->sr_answer_sent))
break;
if (sr ||
(cri && cri->cr_offer_sent && !cri->cr_answer_recv) ||
(cri && cri->cr_offer_recv && !cri->cr_answer_sent)) {
if (nh->nh_soa == NULL) {
if (session_get_description(sip, NULL, NULL))
return nua_client_return(cr, 500, "Overlapping Offer/Answer", msg);
}
}
else if (nh->nh_soa == NULL) {
if (nh->nh_soa == NULL) {
offer_sent = session_get_description(sip, NULL, NULL);
}
else if (sr ||
(cri && cri->cr_offer_sent && !cri->cr_answer_recv) ||
(cri && cri->cr_offer_recv && !cri->cr_answer_sent)) {
if (session_get_description(sip, NULL, NULL))
return nua_client_return(cr, 500, "Overlapping Offer/Answer", msg);
}
else if (!sip->sip_payload) {
soa_init_offer_answer(nh->nh_soa);
@ -3360,7 +3360,7 @@ int nua_update_server_init(nua_server_request_t *sr)
if ((overlap = sr0->sr_offer_recv && !sr0->sr_answer_sent))
break;
if (overlap)
if (nh->nh_soa && overlap)
return nua_server_retry_after(sr, 500, "Overlapping Offer/Answer", 1, 9);
if (nh->nh_soa &&