[asterisk-commits] rmudgett: branch group/CCSS r242369 - /team/group/CCSS/main/ccss.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jan 22 11:19:09 2010
New Revision: 242369

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242369
Log:
Multiple context dialplans would not recognize if a channel was doing CC recall.

Pick the dialcontext first for an outgoing channel to search in the
interfaces list.

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

Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=242369&r1=242368&r2=242369
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Fri Jan 22 11:19:09 2010
@@ -2907,7 +2907,7 @@
 
 	interface_tree = cc_ref(recall_data->interface_tree, "Bump refcount for tree while we search for specific channel");
 	ast_channel_get_device_name(chan, device_name, sizeof(device_name));
-	ast_str_set(&extencontext, 0, "%s@%s", S_OR(chan->macroexten, chan->exten), S_OR(chan->macrocontext, chan->context));
+	ast_str_set(&extencontext, 0, "%s@%s", S_OR(chan->macroexten, chan->exten), S_OR(chan->dialcontext, S_OR(chan->macrocontext, chan->context)));
 	ast_channel_unlock(chan);
 
 	/* Now we need to find out if the channel in question is in the list of interfaces in the