[asterisk-commits] manager: Restore Originate failure behavior from Asterisk 11 (asterisk[14])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Feb 13 07:22:48 CST 2017
Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/4914 )
Change subject: manager: Restore Originate failure behavior from Asterisk 11
......................................................................
manager: Restore Originate failure behavior from Asterisk 11
In Asterisk 11, if the 'Originate' AMI command failed to connect the provided
Channel while in extension mode, a 'failed' extension would be looked up and
run. This was, I believe, unintentionally removed in 51b6c49. This patch
restores that behavior.
This also adds an enum for the various 'synchronous' modes in an attempt to
make them meaningful.
ASTERISK-26115 #close
Reported by: Nasir Iqbal
Change-Id: I8afbd06725e99610e02adb529137d4800c05345d
---
M apps/app_originate.c
M funcs/func_periodic_hook.c
M include/asterisk/pbx.h
M main/manager.c
M main/pbx.c
M pbx/pbx_spool.c
M res/res_clioriginate.c
7 files changed, 51 insertions(+), 25 deletions(-)
Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
Anonymous Coward #1000019: Verified
Joshua Colp: Looks good to me, approved
diff --git a/apps/app_originate.c b/apps/app_originate.c
index f744b7a..88245f0 100644
--- a/apps/app_originate.c
+++ b/apps/app_originate.c
@@ -178,15 +178,15 @@
chantech, chandata, args.arg1, exten, priority);
ast_pbx_outgoing_exten(chantech, cap_slin, chandata,
- timeout * 1000, args.arg1, exten, priority, &outgoing_status, 1, NULL,
- NULL, NULL, NULL, NULL, 0, NULL);
+ timeout * 1000, args.arg1, exten, priority, &outgoing_status,
+ AST_OUTGOING_WAIT, NULL, NULL, NULL, NULL, NULL, 0, NULL);
} else if (!strcasecmp(args.type, "app")) {
ast_debug(1, "Originating call to '%s/%s' and connecting them to %s(%s)\n",
chantech, chandata, args.arg1, S_OR(args.arg2, ""));
ast_pbx_outgoing_app(chantech, cap_slin, chandata,
- timeout * 1000, args.arg1, args.arg2, &outgoing_status, 1, NULL,
- NULL, NULL, NULL, NULL, NULL);
+ timeout * 1000, args.arg1, args.arg2, &outgoing_status,
+ AST_OUTGOING_WAIT, NULL, NULL, NULL, NULL, NULL, NULL);
} else {
ast_log(LOG_ERROR, "Incorrect type, it should be 'exten' or 'app': %s\n",
args.type);
diff --git a/funcs/func_periodic_hook.c b/funcs/func_periodic_hook.c
index bb0ee0d..7086b53 100644
--- a/funcs/func_periodic_hook.c
+++ b/funcs/func_periodic_hook.c
@@ -183,8 +183,8 @@
};
ast_pbx_outgoing_exten("Local", NULL, full_exten_name, 60,
- arg->context, arg->exten, 1, NULL, 0, NULL, NULL, &chan_name_var,
- NULL, NULL, 1, NULL);
+ arg->context, arg->exten, 1, NULL, AST_OUTGOING_NO_WAIT,
+ NULL, NULL, &chan_name_var, NULL, NULL, 1, NULL);
hook_thread_arg_destroy(arg);
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h
index 6da4470..b627c69 100644
--- a/include/asterisk/pbx.h
+++ b/include/asterisk/pbx.h
@@ -1139,6 +1139,12 @@
*/
int ast_async_goto_by_name(const char *chan, const char *context, const char *exten, int priority);
+enum ast_pbx_outgoing_sync {
+ AST_OUTGOING_NO_WAIT = 0, /*!< Don't wait for originated call to answer */
+ AST_OUTGOING_WAIT = 1, /*!< Wait for originated call to answer */
+ AST_OUTGOING_WAIT_COMPLETE = 2, /*!< Wait for originated call to answer and hangup */
+};
+
/*!
* \brief Synchronously or asynchronously make an outbound call and send it to a
* particular extension
@@ -1152,11 +1158,15 @@
* \param priority The destination priority for the outbound channel
* \param reason Optional. If provided, the dialed status of the outgoing channel.
* Codes are AST_CONTROL_xxx values. Valid only if synchronous is non-zero.
- * \param synchronous If zero then don't wait for anything.
- * If one then block until the outbound channel answers or the call fails.
- * If greater than one then wait for the call to complete or if the call doesn't
- * answer and failed at context exists then run a channel named OutgoingSpoolFailed
- * at failed at context.
+ * \param synchronous defined by the ast_pbx_outgoing_sync enum.
+ * If \c AST_OUTGOING_NO_WAIT then don't wait for anything.
+ * If \c AST_OUTGOING_WAIT then block until the outbound channel answers or
+ * the call fails.
+ * If \c AST_OUTGOING_WAIT_COMPLETE then wait for the call to complete or
+ * fail.
+ * If \c AST_OUTGOING_WAIT or \c AST_OUTGOING_WAIT_COMPLETE is specified,
+ * the call doesn't answer, and \c failed at context exists then run a channel
+ * named \c OutgoingSpoolFailed at \c failed at context.
* \param cid_num The caller ID number to set on the outbound channel
* \param cid_name The caller ID name to set on the outbound channel
* \param vars Variables to set on the outbound channel
@@ -1190,9 +1200,12 @@
* \param appdata Data to pass to the application
* \param reason Optional. If provided, the dialed status of the outgoing channel.
* Codes are AST_CONTROL_xxx values. Valid only if synchronous is non-zero.
- * \param synchronous If zero then don't wait for anything.
- * If one then block until the outbound channel answers or the call fails.
- * If greater than one then wait for the call to complete.
+ * \param synchronous defined by the ast_pbx_outgoing_sync enum.
+ * If \c AST_OUTGOING_NO_WAIT then don't wait for anything.
+ * If \c AST_OUTGOING_WAIT then block until the outbound channel answers or
+ * the call fails.
+ * If \c AST_OUTGOING_WAIT_COMPLETE then wait for the call to complete or
+ * fail.
* \param cid_num The caller ID number to set on the outbound channel
* \param cid_name The caller ID name to set on the outbound channel
* \param vars Variables to set on the outbound channel
diff --git a/main/manager.c b/main/manager.c
index 9a7f4c8..dcf0d41 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -5136,13 +5136,15 @@
if (!ast_strlen_zero(in->app)) {
res = ast_pbx_outgoing_app(in->tech, in->cap, in->data,
- in->timeout, in->app, in->appdata, &reason, 1,
+ in->timeout, in->app, in->appdata, &reason,
+ AST_OUTGOING_WAIT,
S_OR(in->cid_num, NULL),
S_OR(in->cid_name, NULL),
in->vars, in->account, &chan, &assignedids);
} else {
res = ast_pbx_outgoing_exten(in->tech, in->cap, in->data,
- in->timeout, in->context, in->exten, in->priority, &reason, 1,
+ in->timeout, in->context, in->exten, in->priority, &reason,
+ AST_OUTGOING_WAIT,
S_OR(in->cid_num, NULL),
S_OR(in->cid_name, NULL),
in->vars, in->account, &chan, in->early_media, &assignedids);
@@ -5613,11 +5615,16 @@
}
}
} else if (!ast_strlen_zero(app)) {
- res = ast_pbx_outgoing_app(tech, cap, data, to, app, appdata, &reason, 1, l, n, vars, account, NULL, assignedids.uniqueid ? &assignedids : NULL);
+ res = ast_pbx_outgoing_app(tech, cap, data, to, app, appdata, &reason,
+ AST_OUTGOING_WAIT, l, n, vars, account, NULL,
+ assignedids.uniqueid ? &assignedids : NULL);
ast_variables_destroy(vars);
} else {
if (exten && context && pi) {
- res = ast_pbx_outgoing_exten(tech, cap, data, to, context, exten, pi, &reason, 1, l, n, vars, account, NULL, bridge_early, assignedids.uniqueid ? &assignedids : NULL);
+ res = ast_pbx_outgoing_exten(tech, cap, data, to,
+ context, exten, pi, &reason, AST_OUTGOING_WAIT,
+ l, n, vars, account, NULL, bridge_early,
+ assignedids.uniqueid ? &assignedids : NULL);
ast_variables_destroy(vars);
} else {
astman_send_error(s, m, "Originate with 'Exten' requires 'Context' and 'Priority'");
diff --git a/main/pbx.c b/main/pbx.c
index 20416c0..7391dab 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -7826,7 +7826,7 @@
early_media, assignedids);
if (res < 0 /* Call failed to get connected for some reason. */
- && 1 < synchronous
+ && 0 < synchronous
&& ast_exists_extension(NULL, context, "failed", 1, NULL)) {
struct ast_channel *failed;
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index c858ed2..ae77d9b 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -399,15 +399,17 @@
int res, reason;
if (!ast_strlen_zero(o->app)) {
ast_verb(3, "Attempting call on %s/%s for application %s(%s) (Retry %d)\n", o->tech, o->dest, o->app, o->data, o->retries);
- res = ast_pbx_outgoing_app(o->tech, o->capabilities, o->dest, o->waittime * 1000,
- o->app, o->data, &reason, 2 /* wait to finish */, o->cid_num, o->cid_name,
+ res = ast_pbx_outgoing_app(o->tech, o->capabilities, o->dest,
+ o->waittime * 1000, o->app, o->data, &reason,
+ AST_OUTGOING_WAIT_COMPLETE, o->cid_num, o->cid_name,
o->vars, o->account, NULL, NULL);
} else {
ast_verb(3, "Attempting call on %s/%s for %s@%s:%d (Retry %d)\n", o->tech, o->dest, o->exten, o->context,o->priority, o->retries);
res = ast_pbx_outgoing_exten(o->tech, o->capabilities, o->dest,
o->waittime * 1000, o->context, o->exten, o->priority, &reason,
- 2 /* wait to finish */, o->cid_num, o->cid_name, o->vars, o->account, NULL,
- ast_test_flag(&o->options, SPOOL_FLAG_EARLY_MEDIA), NULL);
+ AST_OUTGOING_WAIT_COMPLETE, o->cid_num, o->cid_name,
+ o->vars, o->account, NULL, ast_test_flag(&o->options, SPOOL_FLAG_EARLY_MEDIA),
+ NULL);
}
if (res) {
ast_log(LOG_NOTICE, "Call failed to go through, reason (%d) %s\n", reason, ast_channel_reason2str(reason));
diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c
index 451b174..be1fcc5 100644
--- a/res/res_clioriginate.c
+++ b/res/res_clioriginate.c
@@ -74,7 +74,9 @@
return CLI_FAILURE;
}
ast_format_cap_append(cap, ast_format_slin, 0);
- ast_pbx_outgoing_app(chantech, cap, chandata, TIMEOUT * 1000, app, appdata, &reason, 0, NULL, NULL, NULL, NULL, NULL, NULL);
+ ast_pbx_outgoing_app(chantech, cap, chandata, TIMEOUT * 1000, app, appdata,
+ &reason, AST_OUTGOING_NO_WAIT, NULL, NULL, NULL, NULL,
+ NULL, NULL);
ao2_ref(cap, -1);
return CLI_SUCCESS;
@@ -118,7 +120,9 @@
return CLI_FAILURE;
}
ast_format_cap_append(cap, ast_format_slin, 0);
- ast_pbx_outgoing_exten(chantech, cap, chandata, TIMEOUT * 1000, context, exten, 1, &reason, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL);
+ ast_pbx_outgoing_exten(chantech, cap, chandata, TIMEOUT * 1000, context,
+ exten, 1, &reason, AST_OUTGOING_NO_WAIT, NULL, NULL,
+ NULL, NULL, NULL, 0, NULL);
ao2_ref(cap, -1);
return CLI_SUCCESS;
--
To view, visit https://gerrit.asterisk.org/4914
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8afbd06725e99610e02adb529137d4800c05345d
Gerrit-PatchSet: 3
Gerrit-Project: asterisk
Gerrit-Branch: 14
Gerrit-Owner: Sean Bright <sean.bright at gmail.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
More information about the asterisk-commits
mailing list