[asterisk-commits] dvossel: branch 1.6.1 r207031 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Jul 17 12:53:03 2009
New Revision: 207031

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=207031
Log:
Merged revisions 207029 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r207029 | dvossel | 2009-07-17 12:51:44 -0500 (Fri, 17 Jul 2009) | 6 lines
  
  sip option flags handled incorrectly
  
  (closes issue #15376)
  Reported by: Takehiko Ooshima
  Tested by: dvossel, Takehiko_Ooshima
........

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

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=207031&r1=207030&r2=207031
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Fri Jul 17 12:53:03 2009
@@ -18293,7 +18293,7 @@
 	required = get_header(req, "Require");
 	if (!ast_strlen_zero(required)) {
 		required_profile = parse_sip_options(NULL, required);
-		if (required_profile && required_profile != SIP_OPT_REPLACES && required_profile != SIP_OPT_TIMER) {
+		if (required_profile && !(required_profile & (SIP_OPT_REPLACES | SIP_OPT_TIMER))) {
 			/* At this point we only support REPLACES and Session-Timer */
 			transmit_response_with_unsupported(p, "420 Bad extension (unsupported)", req, required);
 			ast_log(LOG_WARNING, "Received SIP INVITE with unsupported required extension: %s\n", required);