Merged revisions 146713 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r146713 | tilghman | 2008-10-06 11:52:14 -0500 (Mon, 06 Oct 2008) | 16 lines
  
  Merged revisions 146711 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r146711 | tilghman | 2008-10-06 11:51:21 -0500 (Mon, 06 Oct 2008) | 9 lines
    
    Check whether an extension exists in the _call method, rather than the _alloc
    method, because we need to evaluate the callerid (since that data affects
    whether an extension exists).
    (closes issue #13343)
     Reported by: efutch
     Patches: 
           20080915__bug13343.diff.txt uploaded by Corydon76 (license 14)
     Tested by: efutch
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@146715 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 12 insertions, 0 deletions

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 7e2eaee30..a5fa06b42 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -515,6 +515,11 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout)
 	ast_cdr_update(p->chan);
 	p->chan->cdrflags = p->owner->cdrflags;
 
+	if (!ast_exists_extension(NULL, p->chan->context, p->chan->exten, 1, p->owner->cid.cid_num)) {
+		ast_log(LOG_NOTICE, "No such extension/context %s@%s while calling Local channel\n", p->chan->exten, p->chan->context);
+		return -1;
+	}
+
 	/* copy the channel variables from the incoming channel to the outgoing channel */
 	/* Note that due to certain assumptions, they MUST be in the same order */
 	AST_LIST_TRAVERSE(&p->owner->varshead, varptr, entries) {
@@ -660,15 +665,22 @@ static struct local_pvt *local_alloc(const char *data, int format)
 
 	tmp->reqformat = format;
 
+#if 0
+	/* We can't do this check here, because we don't know the CallerID yet, and
+	 * the CallerID could potentially affect what step is actually taken (or
+	 * even if that step exists). */
 	if (!ast_exists_extension(NULL, tmp->context, tmp->exten, 1, NULL)) {
 		ast_log(LOG_NOTICE, "No such extension/context %s@%s creating local channel\n", tmp->exten, tmp->context);
 		tmp = local_pvt_destroy(tmp);
 	} else {
+#endif
 		/* Add to list */
 		AST_LIST_LOCK(&locals);
 		AST_LIST_INSERT_HEAD(&locals, tmp, list);
 		AST_LIST_UNLOCK(&locals);
+#if 0
 	}
+#endif
 	
 	return tmp;
 }