Make ast_do_masquerade() a void function.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381086 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 678eaa70e9ad833955a5573bfd9fcdc7a00813c4..b7603b69144e066d95249d9ea74e7d11c5693074 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -24807,9 +24807,7 @@ static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req, st
        ast_channel_unlock(c);
        sip_pvt_unlock(p->refer->refer_call);
        sip_pvt_unlock(p);
-       if (ast_do_masquerade(replacecall)) {
-               ast_log(LOG_WARNING, "Failed to perform masquerade with INVITE replaces\n");
-       }
+       ast_do_masquerade(replacecall);
        ast_channel_lock(c);
        if (earlyreplace || oneleggedreplace ) {
                ast_channel_hangupcause_set(c, AST_CAUSE_SWITCH_CONGESTION);

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index a3974ee006a8081db451c6d67355f3dd52649b6a..f7e4d2d3941ada1f72c982084d21f5f0ea6f9879 100644 (file)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -2322,7 +2322,7 @@ int ast_transfer(struct ast_channel *chan, char *dest);
  *     while the features are nice, the cost is very high in terms of pure nastiness. XXX
  * \param chan Channel to masquerade
  */
-int ast_do_masquerade(struct ast_channel *chan);
+void ast_do_masquerade(struct ast_channel *chan);
 
 /*!
  * \brief Find bridged channel

diff --git a/main/channel.c b/main/channel.c
index 30df1432cbf4597f98a4f3be4c7357b677fcdb50..9c8f32cb508d488bec7800d9b823e3fa67475083 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -6863,7 +6863,7 @@ static void masquerade_colp_transfer(struct ast_channel *transferee, struct xfer
  *       this function, it invalidates our channel container locking order.  All channels
  *       must be unlocked before it is permissible to lock the channels' ao2 container.
  */
-int ast_do_masquerade(struct ast_channel *original)
+void ast_do_masquerade(struct ast_channel *original)
 {
        int x;
        int origstate;
@@ -6940,7 +6940,7 @@ int ast_do_masquerade(struct ast_channel *original)
                 */
                ast_channel_unlock(original);
                ao2_unlock(channels);
-               return 0;
+               return;
        }
 
        /* Bump the refs to ensure that they won't dissapear on us. */
@@ -7345,8 +7345,6 @@ int ast_do_masquerade(struct ast_channel *original)
        /* Release our held safety references. */
        ast_channel_unref(original);
        ast_channel_unref(clonechan);
-
-       return 0;
 }
 
 void ast_set_callerid(struct ast_channel *chan, const char *cid_num, const char *cid_name, const char *cid_ani)