[asterisk-commits] jrose: branch 1.8 r369792 - /branches/1.8/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Mon Jul  9 09:38:18 2012
New Revision: 369792

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369792
Log:
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.


Modified:
    branches/1.8/channels/chan_sip.c

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=369792&r1=369791&r2=369792
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Mon Jul  9 09:38:18 2012
@@ -7006,7 +7006,8 @@
 		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;