diff options
| author | James Golovich <james@gnuinter.net> | 2004-10-28 15:53:36 +0000 |
|---|---|---|
| committer | James Golovich <james@gnuinter.net> | 2004-10-28 15:53:36 +0000 |
| commit | 3c12ea1c8970cf256b2687d511d2182c83971702 (patch) | |
| tree | 8135c13a530986944529a74e0f7159f97122a769 /channels | |
| parent | 6b9d24b54a825dc6866dbf243c0a5ca2b60d3872 (diff) | |
Cleanup formatting in bug 2741 patch
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4118 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_sip.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 9fe9eb5e8..b385aa2a7 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 { |