From 5b236ee647c5fb3e220a0e6405b5bf6a21ba6e1c Mon Sep 17 00:00:00 2001 From: Richard Mudgett <rmudgett@digium.com> Date: Sat, 9 Feb 2013 01:31:55 +0000 Subject: [PATCH] Make ast_do_masquerade() a void function. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381086 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 4 +--- include/asterisk/channel.h | 2 +- main/channel.c | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 678eaa70e9..b7603b6914 100644 --- 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 a3974ee006..f7e4d2d394 100644 --- 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 30df1432cb..9c8f32cb50 100644 --- 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) -- GitLab