diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-21 20:30:33 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-21 20:30:33 +0000 |
| commit | b4fca41a03f63ddf0e3d36a9c82ca4b1e45c4e34 (patch) | |
| tree | 76181da3b358252949b3cbfde7e9472e4df85b68 /channels/chan_dahdi.c | |
| parent | c3947dc9841cfce4c542afed6367fa0bb434ab5d (diff) | |
Merged revisions 207854 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r207854 | jpeeler | 2009-07-21 15:26:02 -0500 (Tue, 21 Jul 2009) | 16 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@207862 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 3ca22c955..447d68c7d 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -6407,7 +6407,6 @@ winkflashdone: break; case SIG_EM: case SIG_EM_E1: - case SIG_EMWINK: case SIG_FEATD: case SIG_SF: case SIG_SFWINK: @@ -6443,7 +6442,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) { |