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

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Jan  4 17:10:49 2010
New Revision: 237654

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=237654
Log:
Two fixes:

1. in sip_call, don't print warning message unless cc_monitor_policy is native.
2. Copy core_id when duplicating datastores.


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=237654&r1=237653&r2=237654
==============================================================================
--- team/group/CCSS/channels/chan_sip.c (original)
+++ team/group/CCSS/channels/chan_sip.c Mon Jan  4 17:10:49 2010
@@ -6786,7 +6786,8 @@
 		return -1;
 	}
 
-	if (ast_cc_is_recall(ast, &cc_core_id)) {
+	if (ast_get_cc_monitor_policy(ast_channel_get_cc_config_params(ast)) == AST_CC_MONITOR_NATIVE &&
+			ast_cc_is_recall(ast, &cc_core_id)) {
 		/* If this is a CC recall, then we have a particular
 		 * URI that we are supposed to send the INVITE to. We
 		 * get this information from the corresponding sip_monitor_instance

Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=237654&r1=237653&r2=237654
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Mon Jan  4 17:10:49 2010
@@ -1380,6 +1380,7 @@
 	new_cc_interfaces->dial_parent_id = old_cc_interfaces->dial_parent_id;
 	new_cc_interfaces->is_original_caller = 0;
 	ao2_t_ref(old_cc_interfaces->interface_tree, +1, "New ref due to duplication of interface tree");
+	new_cc_interfaces->core_id = old_cc_interfaces->core_id;
 	new_cc_interfaces->interface_tree = old_cc_interfaces->interface_tree;
 	return new_cc_interfaces;
 }