aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_misdn.c
diff options
context:
space:
mode:
authorcrichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-25 08:53:47 +0000
committercrichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-25 08:53:47 +0000
commitb28758ea692c3c472ae3c600afa5962f1b25a0ed (patch)
treea9f52df1a5c6e34924879d71b7b15ce8ef30db9e /channels/chan_misdn.c
parentfb0c27fed72803925b7225d9b645f9baf90debca (diff)
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: http://svn.digium.com/svn/asterisk/trunk@71475 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_misdn.c')
-rw-r--r--channels/chan_misdn.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index f8f671421..b6417497c 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 */
/************************************************************/