[asterisk-commits] crichter: trunk r71475 - in /trunk: ./ channels/chan_misdn.c

[SVN commits to the Asterisk project]

Author: crichter
Date: Mon Jun 25 03:53:47 2007
New Revision: 71475

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

................
r71096 | crichter | 2007-06-22 17:17:04 +0200 (Fr, 22 Jun 2007) | 9 lines

Merged revisions 68874 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r68874 | crichter | 2007-06-12 09:48:52 +0200 (Di, 12 Jun 2007) | 1 line

if we have already some digits, we just stop the tones.
........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_misdn.c

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=71475&r1=71474&r2=71475
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Mon Jun 25 03:53:47 2007
@@ -3656,13 +3656,6 @@
 	return 0;
 }
 
-static void wait_for_digits(struct chan_list *ch, struct misdn_bchannel *bc, struct ast_channel *chan) {
-	ch->state = MISDN_WAITING4DIGS;
-	misdn_lib_send_event(bc, EVENT_SETUP_ACKNOWLEDGE);
-	if (bc->nt)
-		dialtone_indicate(ch);
-}
-
 static void start_pbx(struct chan_list *ch, struct misdn_bchannel *bc, struct ast_channel *chan) {
 	if (pbx_start_chan(ch) < 0) {
 		hangup_chan(ch);
@@ -3674,6 +3667,14 @@
 			misdn_lib_send_event(bc, EVENT_RELEASE);
 	}
 }
+
+static void wait_for_digits(struct chan_list *ch, struct misdn_bchannel *bc, struct ast_channel *chan) {
+	ch->state=MISDN_WAITING4DIGS;
+	misdn_lib_send_event(bc, EVENT_SETUP_ACKNOWLEDGE );
+	if (bc->nt && !bc->dad[0])
+		dialtone_indicate(ch);
+}
+
 
 /************************************************************/
 /*  Receive Events from isdn_lib  here                     */