diff options
| -rw-r--r-- | apps/app_meetme.c | 2 | ||||
| -rw-r--r-- | include/asterisk/channel.h | 9 | ||||
| -rw-r--r-- | main/pbx.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index d505077a0..40624c6a4 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -5141,7 +5141,7 @@ static void sla_handle_hold_event(struct sla_event *event) ast_indicate(event->trunk_ref->trunk->chan, AST_CONTROL_HOLD); } - ast_softhangup(event->trunk_ref->chan, AST_CAUSE_NORMAL); + ast_softhangup(event->trunk_ref->chan, AST_SOFTHANGUP_DEV); event->trunk_ref->chan = NULL; } diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index f0ff3d09c..2744b7e37 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -945,7 +945,7 @@ int ast_hangup(struct ast_channel *chan); * \brief Softly hangup up a channel * * \param chan channel to be soft-hung-up - * \param cause Ast hangupcause for hangup + * \param reason an AST_SOFTHANGUP_* reason code * * Call the protocol layer, but don't destroy the channel structure * (use this if you are trying to @@ -955,12 +955,13 @@ int ast_hangup(struct ast_channel *chan); * * \return Returns 0 regardless */ -int ast_softhangup(struct ast_channel *chan, int cause); +int ast_softhangup(struct ast_channel *chan, int reason); /*! \brief Softly hangup up a channel (no channel lock) * \param chan channel to be soft-hung-up - * \param cause Ast hangupcause for hangup (see cause.h) */ -int ast_softhangup_nolock(struct ast_channel *chan, int cause); + * \param reason an AST_SOFTHANGUP_* reason code + */ +int ast_softhangup_nolock(struct ast_channel *chan, int reason); /*! \brief Check to see if a channel is needing hang up * \param chan channel on which to check for hang up diff --git a/main/pbx.c b/main/pbx.c index f30e8b210..f54897799 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -4405,7 +4405,7 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c, } if (!args || !args->no_hangup_chan) { - ast_softhangup(c, c->hangupcause ? c->hangupcause : AST_CAUSE_NORMAL_CLEARING); + ast_softhangup(c, AST_SOFTHANGUP_APPUNLOAD); } if ((!args || !args->no_hangup_chan) && |