diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-21 20:27:47 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-21 20:27:47 +0000 |
| commit | c4716c1a10b562bf49db1d349ead0455f5273d9c (patch) | |
| tree | 6e9724bbbe8468296ff76370b11f8a6ec36eef22 /channels | |
| parent | 3f2f37c2a025a9ed77315307c4de388f4775ae0b (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.0@207860 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 1837ca995..1d67ed5ae 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -5368,7 +5368,6 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) break; case SIG_EM: case SIG_EM_E1: - case SIG_EMWINK: case SIG_FEATD: case SIG_SF: case SIG_SFWINK: @@ -5404,7 +5403,8 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) 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) { |