[svn-commits] mmichelson: branch group/CCSS r236790 - /team/group/CCSS/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Dec 29 11:23:34 2009
New Revision: 236790

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=236790
Log:
Set the peername when we initialize the monitor instance.


Modified:
    team/group/CCSS/channels/chan_sip.c

Modified: team/group/CCSS/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/channels/chan_sip.c?view=diff&rev=236790&r1=236789&r2=236790
==============================================================================
--- team/group/CCSS/channels/chan_sip.c (original)
+++ team/group/CCSS/channels/chan_sip.c Tue Dec 29 11:23:34 2009
@@ -3631,7 +3631,7 @@
 	ast_string_field_free_memory(monitor_instance);
 }
 
-static struct sip_monitor_instance *sip_monitor_instance_init(int core_id, const char * const subscribe_uri)
+static struct sip_monitor_instance *sip_monitor_instance_init(int core_id, const char * const subscribe_uri, const char * const peername)
 {
 	struct sip_monitor_instance *monitor_instance = ao2_alloc(sizeof(*monitor_instance), sip_monitor_instance_destructor);
 
@@ -3645,6 +3645,7 @@
 	}
 
 	ast_string_field_set(monitor_instance, subscribe_uri, subscribe_uri);
+	ast_string_field_set(monitor_instance, peername, peername);
 	monitor_instance->core_id = core_id;
 	ao2_link(sip_monitor_instances, monitor_instance);
 	return monitor_instance;
@@ -3914,7 +3915,7 @@
 			 */
 			goto generic;
 		}
-		if (!(monitor_instance = sip_monitor_instance_init(core_id, subscribe_uri))) {
+		if (!(monitor_instance = sip_monitor_instance_init(core_id, subscribe_uri, pvt->peername))) {
 			/* Same deal. We can try using generic still */
 			goto generic;
 		}