[svn-commits] jrose: branch 10 r369751 - in /branches/10: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Fri Jul  6 16:02:37 2012
New Revision: 369751

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369751
Log:
chan_sip: Add case for FLASH control frames so that we don't display a warning.

chan_sip channels can receive flash control frames when connected to analog
phones and possibly for other reasons. There really isn't a reason to warn when
these frames are received, we can safely ignore them.

Patches:
    dahdi_sip_flash.diff uploaded by Jonathan Rose (license 6182)
........

Merged revisions 369750 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/10/   (props changed)
    branches/10/channels/chan_sip.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_sip.c?view=diff&rev=369751&r1=369750&r2=369751
==============================================================================
--- branches/10/channels/chan_sip.c (original)
+++ branches/10/channels/chan_sip.c Fri Jul  6 16:02:37 2012
@@ -7050,6 +7050,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. */
+		break;
 	case -1:
 		res = -1;
 		break;