kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 10:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 225360 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r225360 | tilghman | 2009-10-22 12:11:23 -0500 (Thu, 22 Oct 2009) | 11 lines
  
  Merged revisions 225105 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r225105 | tilghman | 2009-10-21 11:02:12 -0500 (Wed, 21 Oct 2009) | 4 lines
    
    Fix documentation for ast_softhangup() and correct the misuse thereof.
    (closes issue #16103)
     Reported by: majorbloodnok
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@225362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-10-22 17:14:39 +00:00
parent c64aca3b91
commit ae34805b65
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_meetme.c
View File

@@ -4595,7 +4595,7 @@ static void sla_handle_hold_event(struct sla_event *event)
ast_indicate(event->trunk_ref->trunk->chan, AST_CONTROL_HOLD); 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; event->trunk_ref->chan = NULL;
} }

9
include/asterisk/channel.h
View File

@@ -944,7 +944,7 @@ int ast_hangup(struct ast_channel *chan);
* \brief Softly hangup up a channel * \brief Softly hangup up a channel
* *
* \param chan channel to be soft-hung-up * \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 * Call the protocol layer, but don't destroy the channel structure
* (use this if you are trying to * (use this if you are trying to
@@ -954,12 +954,13 @@ int ast_hangup(struct ast_channel *chan);
* *
* \return Returns 0 regardless * \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) /*! \brief Softly hangup up a channel (no channel lock)
* \param chan channel to be soft-hung-up * \param chan channel to be soft-hung-up
* \param cause Ast hangupcause for hangup (see cause.h) */ * \param reason an AST_SOFTHANGUP_* reason code
int ast_softhangup_nolock(struct ast_channel *chan, int cause); */
int ast_softhangup_nolock(struct ast_channel *chan, int reason);
/*! \brief Check to see if a channel is needing hang up /*! \brief Check to see if a channel is needing hang up
* \param chan channel on which to check for hang up * \param chan channel on which to check for hang up

2
main/pbx.c
View File

@@ -3912,7 +3912,7 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c,
} }
if (!args || !args->no_hangup_chan) { 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) && if ((!args || !args->no_hangup_chan) &&