From: Joshua Colp <jcolp@digium.com>
Date: Fri, 22 May 2009 13:58:58 +0000 (+0000)
Subject: Merged revisions 196117 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~217
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aee4cf59020c23a5a0329124b635923f30f4c0e9;p=thirdparty%2Fasterisk.git

Merged revisions 196117 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r196117 | file | 2009-05-22 10:56:47 -0300 (Fri, 22 May 2009) | 12 lines

  Merged revisions 196116 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r196116 | file | 2009-05-22 10:54:17 -0300 (Fri, 22 May 2009) | 5 lines

    Fix a bug where using immediate with mISDN caused a cause code of 16 to get sent back instead of 1 if the 's' extension did not exist.

    (closes issue #12286)
    Reported by: lmamane
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@196119 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index cd8876e5ba..ea8de87bbd 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -3981,8 +3981,9 @@ static void do_immediate_setup(struct misdn_bchannel *bc, struct chan_list *ch,
   
 	strncpy(ast->exten, "s", 2);
   
-	if (pbx_start_chan(ch) < 0) {
+	if (!ast_canmatch_extension(ast, ast->context, ast->exten, 1, bc->oad) || pbx_start_chan(ch) < 0) {
 		ast = NULL;
+		bc->out_cause = AST_CAUSE_UNALLOCATED;
 		hangup_chan(ch);
 		hanguptone_indicate(ch);