[asterisk-commits] crichter: trunk r89179 - in /trunk: ./ channels/ configs/

[SVN commits to the Asterisk project]

Author: crichter
Date: Mon Nov 12 07:36:45 2007
New Revision: 89179

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89179
Log:
Merged revisions 89173 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89173 | crichter | 2007-11-12 12:26:48 +0100 (Mo, 12 Nov 2007) | 1 line

if we're NT and no number was dialed and overlapdial is set, we wait for the ISDN timeout instead of starting our own timer. added a comment for the misdn.conf.sample for the overlapdial config option.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_misdn.c
    trunk/configs/misdn.conf.sample

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

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=89179&r1=89178&r2=89179
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Mon Nov 12 07:36:45 2007
@@ -4442,6 +4442,17 @@
 			break;
 		}
 
+
+		/*
+		 * When we are NT and overlapdial is set and if 
+		 * the number is empty, we wait for the ISDN timeout
+		 * instead of our own timer.
+		 */
+		if (ch->overlap_dial && bc->nt && !bc->dad[0] ) {
+			wait_for_digits(ch, bc, chan);
+			break;
+		}
+
 		/* 
 		 * If overlapdial we will definitely send a SETUP_ACKNOWLEDGE and wait for more 
 		 * Infos with a Interdigit Timeout.

Modified: trunk/configs/misdn.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/misdn.conf.sample?view=diff&rev=89179&r1=89178&r2=89179
==============================================================================
--- trunk/configs/misdn.conf.sample (original)
+++ trunk/configs/misdn.conf.sample Mon Nov 12 07:36:45 2007
@@ -269,6 +269,13 @@
 ;
 method=standard
 
+
+; specify if chan_misdn should collect digits before going into the 
+; dialplan, you can choose yes=4 Seconds, no, or specify the amount
+; of seconds you need;
+; 
+overlapdial=yes
+
 ;
 ; dialplan means Type Of Number in ISDN Terms (for outgoing calls)
 ;