summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorMatt O'Gorman <mogorman@digium.com>2006-01-12 19:15:20 +0000
committerMatt O'Gorman <mogorman@digium.com>2006-01-12 19:15:20 +0000
commitd6638d52625ebb1b9ccca63c24cf3f88c8c9756d (patch)
tree89378b794eab219c3c34b80ddd21d4e18c4d1a52 /channels
parent0228cf5bc0032de09c86e47ecfa39bc388e9622b (diff)
Oops... need to keep my trunk folder clean...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d57c35b8c..e69a8a50c 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2680,9 +2680,8 @@ static int sip_indicate(struct ast_channel *ast, int condition)
switch(condition) {
case AST_CONTROL_RINGING:
if (ast->_state == AST_STATE_RING) {
- if ((!ast_test_flag(p, SIP_PROGRESS_SENT) ||
- (ast_test_flag(p, SIP_PROG_INBAND) == SIP_PROG_INBAND_NEVER)) &&
- ast_test_flag(p, SIP_PROG_INBAND) != SIP_PROG_INBAND_YES) {
+ if (!ast_test_flag(p, SIP_PROGRESS_SENT) ||
+ (ast_test_flag(p, SIP_PROG_INBAND) == SIP_PROG_INBAND_NEVER)) {
/* Send 180 ringing if out-of-band seems reasonable */
transmit_response(p, "180 Ringing", &p->initreq);
ast_set_flag(p, SIP_RINGING);