kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-08 14:17:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make ast_do_masquerade() a void function.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-02-09 01:31:55 +00:00
parent 9da5ef1b91
commit 5b236ee647
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_sip.c
View File

@@ -24807,9 +24807,7 @@ static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req, st
ast_channel_unlock(c); ast_channel_unlock(c);
sip_pvt_unlock(p->refer->refer_call); sip_pvt_unlock(p->refer->refer_call);
sip_pvt_unlock(p); sip_pvt_unlock(p);
if (ast_do_masquerade(replacecall)) { ast_do_masquerade(replacecall);
ast_log(LOG_WARNING, "Failed to perform masquerade with INVITE replaces\n");
}
ast_channel_lock(c); ast_channel_lock(c);
if (earlyreplace || oneleggedreplace ) { if (earlyreplace || oneleggedreplace ) {
ast_channel_hangupcause_set(c, AST_CAUSE_SWITCH_CONGESTION); ast_channel_hangupcause_set(c, AST_CAUSE_SWITCH_CONGESTION);

2
include/asterisk/channel.h
View File

@@ -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 * while the features are nice, the cost is very high in terms of pure nastiness. XXX
* \param chan Channel to masquerade * \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 * \brief Find bridged channel

6
main/channel.c
View File

@@ -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 * this function, it invalidates our channel container locking order. All channels
* must be unlocked before it is permissible to lock the channels' ao2 container. * 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 x;
int origstate; int origstate;
@@ -6940,7 +6940,7 @@ int ast_do_masquerade(struct ast_channel *original)
*/ */
ast_channel_unlock(original); ast_channel_unlock(original);
ao2_unlock(channels); ao2_unlock(channels);
return 0; return;
} }
/* Bump the refs to ensure that they won't dissapear on us. */ /* 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. */ /* Release our held safety references. */
ast_channel_unref(original); ast_channel_unref(original);
ast_channel_unref(clonechan); 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) void ast_set_callerid(struct ast_channel *chan, const char *cid_num, const char *cid_name, const char *cid_ani)