From a378c3f85214aad5bf752727eda063dfef95337c Mon Sep 17 00:00:00 2001
From: Christian Richter <christian.richter@beronet.com>
Date: Mon, 25 Jun 2007 08:53:47 +0000
Subject: [PATCH] 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.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_misdn.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index f8f671421f..b6417497cf 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -3656,13 +3656,6 @@ int add_out_calls(int port)
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);
@@ -3675,6 +3668,14 @@ static void start_pbx(struct chan_list *ch, struct misdn_bchannel *bc, struct as
}
}
+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 */
/************************************************************/
--
GitLab