From: Automerge script <automerge@asterisk.org>
Date: Fri, 6 Jul 2012 21:21:04 +0000 (+0000)
Subject: Merged revisions 369751 via svnmerge from
X-Git-Tag: 10.7.0-digiumphones-rc1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8930ab6d108b6f99fe1f4c52f8bec568ad96052;p=thirdparty%2Fasterisk.git

Merged revisions 369751 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r369751 | jrose | 2012-07-06 16:02:37 -0500 (Fri, 06 Jul 2012) | 12 lines

  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
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@369763 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9c743493f8..b4b7bf7977 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7130,6 +7130,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. */
+		break;
 	case -1:
 		res = -1;
 		break;