Wed Mar 4 12:24:57 CST 2009 Pekka Pessi <first.last@nokia.com>

  * nta_incoming_magic(): if callback is NULL, return any magic

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

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index e9ab23232e9e57b6e2ffd429a756831b6d53568e..d67e901307b9cacdc8905d49525365779a367b5d 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Tue Mar 10 14:56:15 CDT 2009
+Tue Mar 10 14:57:43 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 6108863664163ae8a227db2059606754edfa3475..7837253b80e6e4462196225081cfcf69d8d5f31b 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
@@ -5828,11 +5828,21 @@ int nta_incoming_status(nta_incoming_t const *irq)
   return irq ? irq->irq_status : 400;
 }
 
-/** Get context pointer for an incoming transaction */
+/** Get application context for a server transaction.
+ *
+ * @param irq server transaction
+ * @param callback callback pointer
+ *
+ * Return the application context bound to the server transaction. If the @a
+ * callback function pointer is given, return application context only if
+ * the callback matches with the callback bound to the server transaction.
+ *
+ */
 nta_incoming_magic_t *nta_incoming_magic(nta_incoming_t *irq,
                                         nta_ack_cancel_f *callback)
 {
-  return irq && irq->irq_callback == callback ? irq->irq_magic : NULL;
+  return irq && (callback == NULL || irq->irq_callback == callback)
+    ? irq->irq_magic : NULL;
 }
 
 /** When received.