summaryrefslogtreecommitdiff
path: root/channels/chan_dahdi.c
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@digium.com>2009-07-21 20:26:02 +0000
committerJeff Peeler <jpeeler@digium.com>2009-07-21 20:26:02 +0000
commit6ac23c3eca28cb21184042844aa4c10efa9081fd (patch)
treeb873ea1ca50c0e8705840d0afafd1c6e1c491248 /channels/chan_dahdi.c
parentb1d9b989ee33667c7d12f91682485cafdf5b86c7 (diff)
Merged revisions 207827 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r207827 | jpeeler | 2009-07-21 15:16:55 -0500 (Tue, 21 Jul 2009) | 9 lines Wait for wink before dialing when using E&M wink signaling There was already code for other signaling types in dahdi_handle_event to handle dialing if a dial operation dial string was present. Simply add SIG_EMWINK to the list. (closes issue #14434) Reported by: araasch ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@207854 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_dahdi.c')
-rw-r--r--channels/chan_dahdi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index ea9c0a819..b8ca4807a 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -7041,7 +7041,6 @@ winkflashdone:
break;
case SIG_EM:
case SIG_EM_E1:
- case SIG_EMWINK:
case SIG_FEATD:
case SIG_SF:
case SIG_SFWINK:
@@ -7075,7 +7074,8 @@ winkflashdone:
case SIG_FEATB:
case SIG_SF_FEATDMF:
case SIG_SF_FEATB:
- /* FGD MF *Must* wait for wink */
+ case SIG_EMWINK:
+ /* FGD MF and EMWINK *Must* wait for wink */
if (!ast_strlen_zero(p->dop.dialstr)) {
res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_DIAL, &p->dop);
if (res < 0) {