From 61c23ee5d14a949276875e9c562c42bd733db7e4 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 15 May 2009 16:18:10 +0000 Subject: [PATCH] Wed May 13 13:39:29 CDT 2009 Pekka Pessi * nua_stack_ack(), nua_invite_client_ack(): cleaned code Ignore-this: 9edf1594e20f27f4e2effb43c83858ea Fixed clean-up after ACK. Coverity issue. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13353 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index dce668adc4..b2b19d1102 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Fri May 15 11:17:02 CDT 2009 +Fri May 15 11:17:32 CDT 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 7c1fe203a0..7bb314247b 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c +++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c @@ -1190,11 +1190,8 @@ int nua_stack_ack(nua_t *nua, nua_handle_t *nh, nua_event_t e, return 1; } - if (tags) { + if (tags) nua_stack_set_params(nua, nh, nua_i_error, tags); - if (nh->nh_soa) - soa_set_params(nh->nh_soa, TAG_NEXT(tags)); - } nua_client_request_ref(cr); error = nua_invite_client_ack(cr, tags); @@ -1387,8 +1384,8 @@ int nua_invite_client_ack(nua_client_request_t *cr, tagi_t const *tags) error: cr->cr_acked = 1; /* ... or we have at least tried */ - nua_client_request_clean(cr); nua_client_request_remove(cr); + nua_client_request_clean(cr); return error; }