[asterisk-commits] file: branch 1.6.0 r196118 - in /branches/1.6.0: ./ channels/chan_misdn.c

[SVN commits to the Asterisk project]

Author: file
Date: Fri May 22 08:57:56 2009
New Revision: 196118

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=196118
Log:
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
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_misdn.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_misdn.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_misdn.c?view=diff&rev=196118&r1=196117&r2=196118
==============================================================================
--- branches/1.6.0/channels/chan_misdn.c (original)
+++ branches/1.6.0/channels/chan_misdn.c Fri May 22 08:57:56 2009
@@ -3977,8 +3977,9 @@
   
 	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);