From: Michael Jerris Date: Wed, 11 Feb 2009 16:55:11 +0000 (+0000) Subject: Tue Jan 13 14:59:50 CST 2009 Pekka Pessi X-Git-Tag: v1.0.3~318 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa2fe6a216e65a4d059f1378dcc9bf49ee9685e2;p=thirdparty%2Ffreeswitch.git Tue Jan 13 14:59:50 CST 2009 Pekka Pessi * nua_session.c: send answer in ACK if offer was sent in 200 OK to re-INVITE Thanks for Liu Yang for reporting the problem. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11813 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index d45ee363c6..bfcf9887d4 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Wed Feb 11 10:54:37 CST 2009 +Wed Feb 11 10:55:01 CST 2009 diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c b/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c index aa38b0c998..a52ebca5a6 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c +++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c @@ -1294,7 +1294,7 @@ int nua_invite_client_ack(nua_client_request_t *cr, tagi_t const *tags) while (sip->sip_supported) sip_header_remove(msg, sip, (sip_header_t*)sip->sip_supported); - if (ss == NULL || ss->ss_state >= nua_callstate_ready) + if (ss == NULL || ss->ss_state > nua_callstate_ready) ; else if (cr->cr_offer_recv && !cr->cr_answer_sent) { if (nh->nh_soa == NULL) { @@ -1312,7 +1312,7 @@ int nua_invite_client_ack(nua_client_request_t *cr, tagi_t const *tags) } } - if (ss == NULL || ss->ss_state >= nua_callstate_ready || reason) + if (ss == NULL || ss->ss_state > nua_callstate_ready || reason) ; else if (nh->nh_soa && soa_is_complete(nh->nh_soa)) { /* signal SOA that O/A round(s) is (are) complete */