[Freeswitch-trunk] [commit] r12557 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta

[FreeSWITCH SVN]

Author: mikej
Date: Tue Mar 10 14:58:34 2009
New Revision: 12557

Log:
Wed Mar  4 12:24:57 CST 2009  Pekka Pessi <first.last at nokia.com>
  * nta_incoming_magic(): if callback is NULL, return any magic



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar 10 14:58:34 2009
@@ -1 +1 @@
-Tue Mar 10 14:56:15 CDT 2009
+Tue Mar 10 14:57:43 CDT 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	Tue Mar 10 14:58:34 2009
@@ -5828,11 +5828,21 @@
   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.