From: David Vossel <dvossel@digium.com>
Date: Fri, 17 Jul 2009 17:53:03 +0000 (+0000)
Subject: Merged revisions 207029 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1fdcb317f24feeb4e5fb19f1b55ec6a194e00a2;p=thirdparty%2Fasterisk.git

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


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 53d448a05e..11b7c5244d 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -18293,7 +18293,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
 	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);