diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 14 | ||||
| -rw-r--r-- | main/pbx.c | 28 |
2 files changed, 36 insertions, 6 deletions
diff --git a/main/channel.c b/main/channel.c index 4510ce252..6c0144491 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1697,7 +1697,7 @@ int ast_hangup(struct ast_channel *chan) } #define ANSWER_WAIT_MS 500 -int __ast_answer(struct ast_channel *chan, unsigned int delay) +int __ast_answer(struct ast_channel *chan, unsigned int delay, int cdr_answer) { int res = 0; @@ -1725,7 +1725,9 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay) res = chan->tech->answer(chan); } ast_setstate(chan, AST_STATE_UP); - ast_cdr_answer(chan->cdr); + if (cdr_answer) { + ast_cdr_answer(chan->cdr); + } ast_channel_unlock(chan); if (delay) { ast_safe_sleep(chan, delay); @@ -1761,6 +1763,12 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay) } break; case AST_STATE_UP: + /* Calling ast_cdr_answer when it it has previously been called + * is essentially a no-op, so it is safe. + */ + if (cdr_answer) { + ast_cdr_answer(chan->cdr); + } break; default: break; @@ -1774,7 +1782,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay) int ast_answer(struct ast_channel *chan) { - return __ast_answer(chan, 0); + return __ast_answer(chan, 0, 1); } void ast_deactivate_generator(struct ast_channel *chan) diff --git a/main/pbx.c b/main/pbx.c index 39a3d8ba2..10792e5cd 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -97,6 +97,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <para>Asterisk will wait this number of milliseconds before returning to the dialplan after answering the call.</para> </parameter> + <parameter name="nocdr"> + <para>Asterisk will send an answer signal to the calling phone, but will not + set the disposition or answer time in the CDR for this call. + </parameter> </syntax> <description> <para>If the call has not been answered, this application will @@ -8310,15 +8314,33 @@ static int pbx_builtin_congestion(struct ast_channel *chan, void *data) static int pbx_builtin_answer(struct ast_channel *chan, void *data) { int delay = 0; + int answer_cdr = 1; + char *parse; + AST_DECLARE_APP_ARGS(args, + AST_APP_ARG(delay); + AST_APP_ARG(answer_cdr); + ); + + if (ast_strlen_zero(data)) { + return __ast_answer(chan, 0, 1); + } - if ((chan->_state != AST_STATE_UP) && !ast_strlen_zero(data)) + parse = ast_strdupa(data); + + AST_STANDARD_APP_ARGS(args, parse); + + if (!ast_strlen_zero(args.delay) && (chan->_state != AST_STATE_UP)) delay = atoi(data); if (delay < 0) { delay = 0; } - return __ast_answer(chan, delay); + if (!ast_strlen_zero(args.answer_cdr) && !strcasecmp(args.answer_cdr, "nocdr")) { + answer_cdr = 0; + } + + return __ast_answer(chan, delay, answer_cdr); } static int pbx_builtin_incomplete(struct ast_channel *chan, void *data) @@ -8335,7 +8357,7 @@ static int pbx_builtin_incomplete(struct ast_channel *chan, void *data) if (ast_check_hangup(chan)) { return -1; } else if (chan->_state != AST_STATE_UP && answer) { - __ast_answer(chan, 0); + __ast_answer(chan, 0, 1); } return AST_PBX_INCOMPLETE; |