Merged revisions 293305 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r293305 | jpeeler | 2010-10-29 16:48:38 -0500 (Fri, 29 Oct 2010) | 9 lines

  Modify sip_setoption to not complain about unknown options.

  This now behaves just like the other setoption callbacks. For the curious the
  offending option for the reporter was AST_OPTION_CHANNEL_WRITE which was getting
  passed due to a fix for chan_local in 286189.

  (closes issue #17985)
  Reported by: globalnetinc
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293306 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 00713d5e62917282ce709bc1240ba94951090839..a53fe4a1d32cf9720776dba4dd9598259528c5aa 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4065,7 +4065,6 @@ static int sip_setoption(struct ast_channel *chan, int option, void *data, int d
                res = 0;
                break;
        default:
-               ast_log(LOG_NOTICE, "Unknown option: %d\n", option);
                break;
        }