Cleanup formatting in bug 2741 patch

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4118 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
James Golovich 21 years ago
parent 6b9d24b54a
commit 3c12ea1c89

@ -6946,11 +6946,11 @@ static int sip_park(struct ast_channel *chan1, struct ast_channel *chan2, struct
return -1; return -1;
} }
static void ast_quiet_chan(struct ast_channel *chan) { static void ast_quiet_chan(struct ast_channel *chan)
if(chan && chan->_state == AST_STATE_UP) { {
if(chan->generatordata) if (chan && chan->_state == AST_STATE_UP) {
if (chan->generatordata)
ast_deactivate_generator(chan); ast_deactivate_generator(chan);
} }
} }
@ -6980,13 +6980,13 @@ static int attempt_transfer(struct sip_pvt *p1, struct sip_pvt *p2)
peera = chana; peera = chana;
peerb = chanb; peerb = chanb;
peerc = bridgea; peerc = bridgea;
} else if(bridgeb) { } else if (bridgeb) {
peera = chanb; peera = chanb;
peerb = chana; peerb = chana;
peerc = bridgeb; peerc = bridgeb;
} }
if(peera && peerb && peerc) { if (peera && peerb && peerc) {
ast_quiet_chan(peera); ast_quiet_chan(peera);
ast_quiet_chan(peerb); ast_quiet_chan(peerb);
ast_quiet_chan(peerc); 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)) { if (ast_channel_masquerade(peerb, peerc)) {
ast_log(LOG_WARNING, "Failed to masquerade %s into %s\n", peerb->name, peerc->name); ast_log(LOG_WARNING, "Failed to masquerade %s into %s\n", peerb->name, peerc->name);
res = -1; res = -1;
} }
return res; return res;
} else { } else {

@ -305,9 +305,9 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
char *monitor_exec; char *monitor_exec;
if (chan && peer) { if (chan && peer) {
pbx_builtin_setvar_helper(chan, "BRIDGEPEER", peer->name); pbx_builtin_setvar_helper(chan, "BRIDGEPEER", peer->name);
pbx_builtin_setvar_helper(peer, "BRIDGEPEER", chan->name); pbx_builtin_setvar_helper(peer, "BRIDGEPEER", chan->name);
} else if (chan) } else if (chan)
pbx_builtin_setvar_helper(chan, "BLINDTRANSFER", NULL); pbx_builtin_setvar_helper(chan, "BLINDTRANSFER", NULL);
if (monitor_ok) { if (monitor_ok) {

Loading…
Cancel
Save