aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-17 17:53:03 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-17 17:53:03 +0000
commit7d6e6601c71bd5df41604c233be65db1d325e79b (patch)
treec1dd649767df5827e48023d9ec3837e20ab479c0
parent35ae35e5cbd47b00d9d90eaf248a001cbae529fa (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@207031 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 53d448a05..11b7c5244 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);