From: Jonathan Rose Date: Mon, 9 Jul 2012 14:38:18 +0000 (+0000) Subject: chan_sip: Fix small behavioral change accidentally introduced in r369750 X-Git-Tag: 1.8.15.0-rc1~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b240190805ad1ee2a7e350ebc09786aeb9d32fa;p=thirdparty%2Fasterisk.git chan_sip: Fix small behavioral change accidentally introduced in r369750 When removing the warning for AST_CONTROL_FLASH from sip_indicate, I also inadvertently changed the return value, which would likely make the indication not be sent in audio. This fixes that while still removing the warning message. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@369792 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 64fec4dfba..facf60cd63 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7006,7 +7006,8 @@ static int sip_indicate(struct ast_channel *ast, int condition, const void *data break; case AST_CONTROL_UPDATE_RTP_PEER: /* Absorb this since it is handled by the bridge */ break; - case AST_CONTROL_FLASH: /* Absorb this since it is irrelevant to SIP. */ + case AST_CONTROL_FLASH: /* We don't currently handle AST_CONTROL_FLASH here, but it is expected, so we don't need to warn either. */ + res = -1; break; case -1: res = -1;