[svn-commits] tilghman: trunk r299627 - in /trunk: ./ channels/chan_local.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sat Dec 25 04:08:04 2010
New Revision: 299627

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

................
  r299626 | tilghman | 2010-12-25 04:07:15 -0600 (Sat, 25 Dec 2010) | 19 lines
  
  Merged revisions 299625 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r299625 | tilghman | 2010-12-25 04:05:00 -0600 (Sat, 25 Dec 2010) | 12 lines
    
    Merged revisions 299624 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r299624 | tilghman | 2010-12-25 04:04:06 -0600 (Sat, 25 Dec 2010) | 5 lines
      
      Move check for extension existence below variable inheritance, due to the possible use of an eswitch.
      
      (closes issue #16228)
       Reported by: jlaguilar
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_local.c

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

Modified: trunk/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_local.c?view=diff&rev=299627&r1=299626&r2=299627
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Sat Dec 25 04:08:04 2010
@@ -795,15 +795,6 @@
 
 	ast_channel_cc_params_init(p->chan, ast_channel_get_cc_config_params(p->owner));
 
-	if (!ast_exists_extension(NULL, p->chan->context, p->chan->exten, 1,
-		S_COR(p->owner->caller.id.number.valid, p->owner->caller.id.number.str, NULL))) {
-		ast_log(LOG_NOTICE, "No such extension/context %s@%s while calling Local channel\n", p->chan->exten, p->chan->context);
-		ao2_unlock(p);
-		ast_channel_unlock(p->chan);
-		ao2_ref(p, -1);
-		return -1;
-	}
-
 	/* Make sure we inherit the ANSWERED_ELSEWHERE flag if it's set on the queue/dial call request in the dialplan */
 	if (ast_test_flag(ast, AST_FLAG_ANSWERED_ELSEWHERE)) {
 		ast_set_flag(p->chan, AST_FLAG_ANSWERED_ELSEWHERE);
@@ -829,6 +820,15 @@
 		*slash = '\0';
 	}
 	ast_set_cc_interfaces_chanvar(p->chan, reduced_dest);
+
+	if (!ast_exists_extension(p->chan, p->chan->context, p->chan->exten, 1,
+		S_COR(p->owner->caller.id.number.valid, p->owner->caller.id.number.str, NULL))) {
+		ast_log(LOG_NOTICE, "No such extension/context %s@%s while calling Local channel\n", p->chan->exten, p->chan->context);
+		ao2_unlock(p);
+		ast_channel_unlock(p->chan);
+		ao2_ref(p, -1);
+		return -1;
+	}
 
 	/* Start switch on sub channel */
 	if (!(res = ast_pbx_start(p->chan)))