diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 9fe9eb5e82b6fabcd332d23dbb0f7745e884985c..b385aa2a71a4f8ebc655c970ee8132cfa1d727c9 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -6946,11 +6946,11 @@ static int sip_park(struct ast_channel *chan1, struct ast_channel *chan2, struct return -1; } -static void ast_quiet_chan(struct ast_channel *chan) { - if(chan && chan->_state == AST_STATE_UP) { - if(chan->generatordata) +static void ast_quiet_chan(struct ast_channel *chan) +{ + if (chan && chan->_state == AST_STATE_UP) { + if (chan->generatordata) ast_deactivate_generator(chan); - } } @@ -6980,13 +6980,13 @@ static int attempt_transfer(struct sip_pvt *p1, struct sip_pvt *p2) peera = chana; peerb = chanb; peerc = bridgea; - } else if(bridgeb) { + } else if (bridgeb) { peera = chanb; peerb = chana; peerc = bridgeb; } - if(peera && peerb && peerc) { + if (peera && peerb && peerc) { ast_quiet_chan(peera); ast_quiet_chan(peerb); ast_quiet_chan(peerc); @@ -7007,7 +7007,7 @@ static int attempt_transfer(struct sip_pvt *p1, struct sip_pvt *p2) if (ast_channel_masquerade(peerb, peerc)) { ast_log(LOG_WARNING, "Failed to masquerade %s into %s\n", peerb->name, peerc->name); - res = -1; + res = -1; } return res; } else { diff --git a/res/res_features.c b/res/res_features.c index bc10ca5a8d245f7ac83319430279919ef67a1c59..f79d2b4e29298c32ccbf9e8a26a84974e6b3dd20 100755 --- a/res/res_features.c +++ b/res/res_features.c @@ -305,9 +305,9 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast char *monitor_exec; if (chan && peer) { - pbx_builtin_setvar_helper(chan, "BRIDGEPEER", peer->name); - pbx_builtin_setvar_helper(peer, "BRIDGEPEER", chan->name); - } else if (chan) + pbx_builtin_setvar_helper(chan, "BRIDGEPEER", peer->name); + pbx_builtin_setvar_helper(peer, "BRIDGEPEER", chan->name); + } else if (chan) pbx_builtin_setvar_helper(chan, "BLINDTRANSFER", NULL); if (monitor_ok) {