diff options
| author | Jonathan Rose <jrose@digium.com> | 2012-07-09 14:54:22 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2012-07-09 14:54:22 +0000 |
| commit | 60bc927579187b3b86d1e51075d42b89d3533889 (patch) | |
| tree | 473961f068d22bbe9abb36436cade02aec7e7b00 /channels | |
| parent | a3fa37b8cfbe82777b4954214afaad7b020081e5 (diff) | |
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.
........
Merged revisions 369792 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 369793 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369794 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 35316ce24..8f44194ba 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7199,7 +7199,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 AST_CONTROL_PVT_CAUSE_CODE: /* these should be handled by the code in channel.c */ case -1: |