diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-09-28 18:27:02 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-09-28 18:27:02 +0000 |
| commit | b5138fccf441ed814b2b0aadb7cd1bae9dc93fef (patch) | |
| tree | ccaa89564685aac77643d67396f111f222fcdede /channels/sig_analog.c | |
| parent | 89d427ca2465e8dfa4f6f490bb884259092e0023 (diff) | |
Add pause one second W dial modifier.
* The following dialplan applications now recognize 'W' to pause sending
DTMF for one second in addition to the previously existing 'w' that paused
sending DTMF for half a second. Dial, ExternalIVR, and SendDTMF.
* The chan_dahdi analog port dialing and deferred DTMF dialing for PRI now
distinguishes between 'w' and 'W'. The 'w' pauses dialing for half a
second. The 'W' pauses dialing for one second.
* Created dahdi_dial_str() in chan_dahdi that eliminated a lot of
duplicated dialing code and diagnostic messages for the channel driver.
(closes issue ASTERISK-20039)
Reported by: Jeremiah Gowdy
Patches:
jgowdy-wait-6-22-2012.diff (license #5621) patch uploaded by Jeremiah Gowdy
Expanded patch to add support in chan_dahdi.
Tested by: rmudgett
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_analog.c')
| -rw-r--r-- | channels/sig_analog.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/channels/sig_analog.c b/channels/sig_analog.c index 79e8e7cb2..395f1a520 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -1257,10 +1257,7 @@ int analog_call(struct analog_pvt *p, struct ast_channel *ast, const char *rdest analog_set_waitingfordt(p, ast); if (!res) { if (analog_dial_digits(p, ANALOG_SUB_REAL, &p->dop)) { - int saveerr = errno; - analog_on_hook(p); - ast_log(LOG_WARNING, "Dialing failed on channel %d: %s\n", p->channel, strerror(saveerr)); return -1; } } else { @@ -2767,10 +2764,7 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_ analog_train_echocanceller(p); ast_copy_string(p->dop.dialstr, p->echorest, sizeof(p->dop.dialstr)); p->dop.op = ANALOG_DIAL_OP_REPLACE; - if (analog_dial_digits(p, ANALOG_SUB_REAL, &p->dop)) { - int dial_err = errno; - ast_log(LOG_WARNING, "Dialing failed on channel %d: %s\n", p->channel, strerror(dial_err)); - } + analog_dial_digits(p, ANALOG_SUB_REAL, &p->dop); p->echobreak = 0; } else { analog_set_dialing(p, 0); @@ -2963,9 +2957,7 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_ p->echobreak = 0; } if (analog_dial_digits(p, ANALOG_SUB_REAL, &p->dop)) { - int saveerr = errno; analog_on_hook(p); - ast_log(LOG_WARNING, "Dialing failed on channel %d: %s\n", p->channel, strerror(saveerr)); return NULL; } analog_set_dialing(p, 1); @@ -2999,8 +2991,7 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_ } else if (!ast_strlen_zero(p->dop.dialstr)) { /* nick@dccinc.com 4/3/03 - fxo should be able to do deferred dialing */ res = analog_dial_digits(p, ANALOG_SUB_REAL, &p->dop); - if (res < 0) { - ast_log(LOG_WARNING, "Unable to initiate dialing on trunk channel %d: %s\n", p->channel, strerror(errno)); + if (res) { p->dop.dialstr[0] = '\0'; return NULL; } else { @@ -3409,8 +3400,7 @@ winkflashdone: /* 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) { - ast_log(LOG_WARNING, "Unable to initiate dialing on trunk channel %d: %s\n", p->channel, strerror(errno)); + if (res) { p->dop.dialstr[0] = '\0'; return NULL; } else { @@ -3441,8 +3431,7 @@ winkflashdone: case ANALOG_SIG_SF_FEATD: if (!ast_strlen_zero(p->dop.dialstr)) { res = analog_dial_digits(p, ANALOG_SUB_REAL, &p->dop); - if (res < 0) { - ast_log(LOG_WARNING, "Unable to initiate dialing on trunk channel %d: %s\n", p->channel, strerror(errno)); + if (res) { p->dop.dialstr[0] = '\0'; return NULL; } else { |