Merged revisions 369793 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r369793 | jrose | 2012-07-09 09:43:49 -0500 (Mon, 09 Jul 2012) | 9 lines

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

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index b4b7bf797763f36b31bd32611705c5811ebc121e..f5549c481fcdc7b3b4fb6fd7e585ebe8263c005c 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7130,7 +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. */
+       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;