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 cd8876e5bae710d8d490cb0abd39df84bcc92618..ea8de87bbda3f807e7983a695f5a1159f3e33819 100644 (file)
--- 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);