[asterisk-commits] rmudgett: branch rmudgett/dahdi_ccss r242405 - /team/rmudgett/dahdi_ccss/chan...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jan 22 12:20:36 2010
New Revision: 242405

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242405
Log:
Use the correct string format when initializing the CC_INTERFACES channel variable.

Modified:
    team/rmudgett/dahdi_ccss/channels/sig_pri.c

Modified: team/rmudgett/dahdi_ccss/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_ccss/channels/sig_pri.c?view=diff&rev=242405&r1=242404&r2=242405
==============================================================================
--- team/rmudgett/dahdi_ccss/channels/sig_pri.c (original)
+++ team/rmudgett/dahdi_ccss/channels/sig_pri.c Fri Jan 22 12:20:36 2010
@@ -1366,6 +1366,8 @@
 		sig_pri_dsp_reset_and_flush_digits(p);
 		sig_pri_set_echocanceller(p, 1);
 		ast_setstate(chan, AST_STATE_RING);
+/* BUGBUG may need to resetup the CC_INTERFACES channel variable here if this is a CC recall. */
+/* BUGBUG Will not need to do anything here when ast_cc_agent_set_interfaces_chanvar() is available. */
 		res = ast_pbx_run(chan);
 		if (res) {
 			ast_log(LOG_WARNING, "PBX exited non-zero!\n");
@@ -2365,13 +2367,15 @@
 			owner = pri->pvts[chanpos]->owner;
 			if (owner) {
 				struct ast_cc_agent *agent;
-				char device_name[AST_CHANNEL_NAME];
+				char exten_context[AST_CHANNEL_NAME];
 
 				agent = sig_pri_find_cc_agent_by_cc_id(pri, subcmd->u.cc_call.cc_id);
 				if (agent) {
 					ast_setup_cc_recall_datastore(owner, agent->core_id);
-					ast_channel_get_device_name(owner, device_name, sizeof(device_name));
-					ast_set_cc_interfaces_chanvar(owner, device_name);
+/* BUGBUG revisit this when ast_cc_agent_set_interfaces_chanvar() is available. */
+					snprintf(exten_context, sizeof(exten_context), "%s@%s", owner->exten,
+						owner->context);
+					ast_set_cc_interfaces_chanvar(owner, exten_context);
 					ast_cc_agent_recalling(agent->core_id,
 						"ISDN caller is attempting recall");
 					ao2_ref(agent, -1);