[svn-commits] mmichelson: branch group/CCSS r248096 - in /team/group/CCSS: channels/ main/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Feb 19 14:26:56 2010
New Revision: 248096

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=248096
Log:
* Ensure extension monitors have a valid core ID assigned to them
* Remove debug line from SIP PIDF parsing.


Modified:
    team/group/CCSS/channels/chan_sip.c
    team/group/CCSS/main/ccss.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=248096&r1=248095&r2=248096
==============================================================================
--- team/group/CCSS/channels/chan_sip.c (original)
+++ team/group/CCSS/channels/chan_sip.c Fri Feb 19 14:26:56 2010
@@ -22061,8 +22061,6 @@
 		return -1;
 	}
 
-	ast_log(LOG_NOTICE, "PIDF document is valid!\n");
-
 	/* It's important to note that the PIDF validation routine has no knowledge
 	 * of what we specifically want in this instance. A valid PIDF document could
 	 * have no tuples, or it could have tuples whose status element has no basic

Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=248096&r1=248095&r2=248096
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Fri Feb 19 14:26:56 2010
@@ -1825,7 +1825,7 @@
 	dial_cc_datastore->data = interfaces;
 	dial_cc_datastore->inheritance = DATASTORE_INHERIT_FOREVER;
 	interfaces->dial_parent_id = monitor->id;
-	interfaces->core_id = ast_atomic_fetchadd_int(&core_id_counter, +1);
+	interfaces->core_id = monitor->core_id = ast_atomic_fetchadd_int(&core_id_counter, +1);
 	interfaces->is_original_caller = 1;
 	ast_channel_lock(chan);
 	ast_channel_datastore_add(chan, dial_cc_datastore);
@@ -2128,6 +2128,7 @@
 	 * on the datastore, so we need to copy that into this monitor.
 	 */
 	monitor->dialstring = ast_strdup(interfaces->current_extension_dialstring);
+	monitor->core_id = interfaces->core_id;
 	AST_LIST_LOCK(interfaces->interface_tree);
 	cc_ref(monitor, "monitor tree's reference to the monitor");
 	AST_LIST_INSERT_TAIL(interfaces->interface_tree, monitor, next);