diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2009-07-21 20:26:02 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2009-07-21 20:26:02 +0000 |
| commit | 6ac23c3eca28cb21184042844aa4c10efa9081fd (patch) | |
| tree | b873ea1ca50c0e8705840d0afafd1c6e1c491248 | |
| parent | b1d9b989ee33667c7d12f91682485cafdf5b86c7 (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
| -rw-r--r-- | channels/chan_dahdi.c | 4 | ||||
| -rw-r--r-- | channels/sig_analog.c | 4 |
2 files changed, 4 insertions, 4 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) { diff --git a/channels/sig_analog.c b/channels/sig_analog.c index 49b9c6bd5..9a5081ebe 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -2670,7 +2670,6 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_ break; case ANALOG_SIG_EM: case ANALOG_SIG_EM_E1: - case ANALOG_SIG_EMWINK: case ANALOG_SIG_FEATD: case ANALOG_SIG_SF: case ANALOG_SIG_SFWINK: @@ -2704,7 +2703,8 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_ case ANALOG_SIG_FEATB: case ANALOG_SIG_SF_FEATDMF: case ANALOG_SIG_SF_FEATB: - /* FGD MF *Must* wait for wink */ + case ANALOG_SIG_EMWINK: + /* FGD MF and EMWINK *Must* wait for wink */ if (!ast_strlen_zero(p->dop.dialstr)) { res = analog_dial_digits(p, ANALOG_SUB_REAL, &p->dop); if (res < 0) { |