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

Cleanup formatting in bug 2741 patch

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4118 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
James Golovich
2004-10-28 15:53:36 +00:00
parent 6b9d24b54a
commit 3c12ea1c89
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
channels/chan_sip.c
View File

@@ -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 {

6
res/res_features.c
View File

@@ -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) {