Thu May 14 13:05:43 CDT 2009 Pekka Pessi <first.last@nokia.com>

  * nta: clarify outgoing_ack() logic
  Ignore-this: a745b3e7df63835d9768ec9dc3d5c5b2

  Coverity issue.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13354 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index b2b19d1102e3740c2783132289392be5be47f569..2d1ba70b815efcbc8e06212fadb3d147ce232771 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Fri May 15 11:17:32 CDT 2009
+Fri May 15 11:18:36 CDT 2009

diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
index a16062f084f9d9162c8c4ea575f2ebe6575d1cac..eba9835559cef60d46235bbefd1b582a4b2e186c 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
@@ -9353,7 +9353,6 @@ static int outgoing_duplicate(nta_outgoing_t *orq,
  */
 void outgoing_ack(nta_outgoing_t *orq, sip_t *sip)
 {
-  nta_outgoing_t *ack;
   msg_t *ackmsg;
 
   assert(orq);
@@ -9367,18 +9366,16 @@ void outgoing_ack(nta_outgoing_t *orq, sip_t *sip)
   assert(orq->orq_tport);
 
   ackmsg = outgoing_ackmsg(orq, SIP_METHOD_ACK, SIPTAG_TO(sip->sip_to), TAG_END());
+  if (!ackmsg)
+    return;
 
-  if (ackmsg) {
-    if ((ack = outgoing_create(orq->orq_agent, NULL, NULL,
-                              NULL, orq->orq_tpn, ackmsg,
-                              NTATAG_BRANCH_KEY(sip->sip_via->v_branch),
-                              NTATAG_USER_VIA(1),
-                              NTATAG_STATELESS(1),
-                              TAG_END())))
-      ;
-    else
-      msg_destroy(ackmsg);
-  }
+  if (!outgoing_create(orq->orq_agent, NULL, NULL,
+                     NULL, orq->orq_tpn, ackmsg,
+                     NTATAG_BRANCH_KEY(sip->sip_via->v_branch),
+                     NTATAG_USER_VIA(1),
+                     NTATAG_STATELESS(1),
+                     TAG_END()))
+    msg_destroy(ackmsg);
 }
 
 /** Generate messages for hop-by-hop ACK or CANCEL.