diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-21 20:16:55 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-21 20:16:55 +0000 |
| commit | d746f64f33cd315bd4668ea65010a45832f5a5ea (patch) | |
| tree | 879a1b06afaacd20a8ceadbc8feee4236269dc9c /channels/chan_dahdi.c | |
| parent | f19069a0066107c8d49bfdca8c69ad7d59df8bcb (diff) | |
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.4@207827 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 1e6b4d6b1..eaa537d4a 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -2372,7 +2372,7 @@ static int dahdi_call(struct ast_channel *ast, char *rdest, int timeout) return -1; } } else - ast_log(LOG_DEBUG, "Deferring dialing...\n"); + ast_log(LOG_DEBUG, "Deferring dialing... (res %d)\n", res); p->dialing = 1; if (ast_strlen_zero(c)) p->dialednone = 1; @@ -4803,7 +4803,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: @@ -4837,7 +4836,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) { |