[asterisk-commits] mmichelson: branch group/CCSS r217147 - /team/group/CCSS/main/ccss.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Sep  8 14:06:16 2009
New Revision: 217147

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=217147
Log:
Fix a few crashes I was coming across.


Modified:
    team/group/CCSS/main/ccss.c

Modified: team/group/CCSS/main/ccss.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=217147&r1=217146&r2=217147
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Tue Sep  8 14:06:16 2009
@@ -857,10 +857,10 @@
 {
 	struct ast_cc_monitor *new_monitor;
 	struct ast_cc_monitor_link *new_link;
-	struct ast_cc_monitor *finder = alloca(sizeof(finder) + strlen(interface->name));
+	struct ast_cc_monitor *finder = alloca(sizeof(*finder) + strlen(interface->name));
 
 	strcpy(finder->name, interface->name);
-	finder->monitor_class = interface->monitor_class;
+	finder->monitor_type = interface->monitor_type;
 
 	if ((new_monitor = ao2_find(cc_monitors, finder, OBJ_POINTER))) {
 		ast_log(LOG_NOTICE, "Found monitor %s in tree. Re-using\n", new_monitor->name);
@@ -949,6 +949,7 @@
 	ast_assert(core_instance->monitor == NULL);
 
 	interface_tree_to_monitor(pending_offer, core_instance);
+	core_instance->monitor = root_monitor;
 
 	ao2_ref(core_instance, -1);
 	ao2_ref(pending_offer, -1);