[svn-commits] mmichelson: trunk r306576 - in /trunk: ./ main/ccss.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Feb  7 11:55:38 2011
New Revision: 306576

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306576
Log:
Merged revisions 306575 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r306575 | mmichelson | 2011-02-07 11:36:56 -0600 (Mon, 07 Feb 2011) | 9 lines
  
  Rearrange a bit of code in the generic CC recall operation.
  
  By waiting to call the callback macro after the CC_INTERFACES,
  extension, priority, and context have been set, this information
  can be accessed more easily within the callback macro.
  
  Reported by Philippe Lindheimer.
........

Modified:
    trunk/   (props changed)
    trunk/main/ccss.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/ccss.c?view=diff&rev=306576&r1=306575&r2=306576
==============================================================================
--- trunk/main/ccss.c (original)
+++ trunk/main/ccss.c Mon Feb  7 11:55:38 2011
@@ -2505,6 +2505,18 @@
 		return NULL;
 	}
 	ast_format_cap_destroy(tmp_cap);
+	
+	/* We have a channel. It's time now to set up the datastore of recalled CC interfaces.
+	 * This will be a common task for all recall functions. If it were possible, I'd have
+	 * the core do it automatically, but alas I cannot. Instead, I will provide a public
+	 * function to do so.
+	 */
+	ast_setup_cc_recall_datastore(chan, agent->core_id);
+	ast_cc_agent_set_interfaces_chanvar(chan);
+
+	ast_copy_string(chan->exten, generic_pvt->exten, sizeof(chan->exten));
+	ast_copy_string(chan->context, generic_pvt->context, sizeof(chan->context));
+	chan->priority = 1;
 
 	if (!ast_strlen_zero(callback_macro)) {
 		ast_log_dynamic_level(cc_logger_level, "Core %d: There's a callback macro configured for agent %s\n",
@@ -2515,17 +2527,6 @@
 			return NULL;
 		}
 	}
-	/* We have a channel. It's time now to set up the datastore of recalled CC interfaces.
-	 * This will be a common task for all recall functions. If it were possible, I'd have
-	 * the core do it automatically, but alas I cannot. Instead, I will provide a public
-	 * function to do so.
-	 */
-	ast_setup_cc_recall_datastore(chan, agent->core_id);
-	ast_cc_agent_set_interfaces_chanvar(chan);
-
-	ast_copy_string(chan->exten, generic_pvt->exten, sizeof(chan->exten));
-	ast_copy_string(chan->context, generic_pvt->context, sizeof(chan->context));
-	chan->priority = 1;
 	ast_cc_agent_recalling(agent->core_id, "Generic agent %s is recalling", agent->device_name);
 	ast_pbx_start(chan);
 	return NULL;