Merged revisions 225360 via svnmerge from

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.0@225361 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index b581d7ae0d8fddbe6266f42d66643fc6088bf42f..3abb8f921191c9e9a711f103d41dee2a278c69a8 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4537,7 +4537,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 a5f080df8d159da4111e5e64e952d21777b30b12..4c15b482a00cc06fbd34ffa3841787b60364f0c1 100644 (file)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -950,7 +950,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
@@ -960,12 +960,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 7d30d31cc5f105f8b538453c64f23f1873b23395..348a4619ac10c2be8ad5e1096617601cfd7710c6 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3826,7 +3826,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) &&