[svn-commits] dvossel: branch 1.6.1 r206774 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Wed Jul 15 17:06:07 2009
New Revision: 206774

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

........
  r206768 | dvossel | 2009-07-15 17:04:13 -0500 (Wed, 15 Jul 2009) | 8 lines
  
  Session timer were not activated if Supported header field in INVITE had both "timer" and other options.
  
  (closes issue #15403)
  Reported by: makoto
  Patches:
        sip-session-timer.patch uploaded by makoto (license
........

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=206774&r1=206773&r2=206774
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Wed Jul 15 17:06:07 2009
@@ -18665,7 +18665,7 @@
 	}
 
 	/* Session-Timers */
-	if (p->sipoptions == SIP_OPT_TIMER) {
+	if (p->sipoptions & SIP_OPT_TIMER) {
 		/* The UAC has requested session-timers for this session. Negotiate
 		the session refresh interval and who will be the refresher */
 		ast_debug(2, "Incoming INVITE with 'timer' option enabled\n");
@@ -18734,7 +18734,7 @@
 			break;
 
 		case SESSION_TIMER_MODE_REFUSE:
-			if (p->reqsipoptions == SIP_OPT_TIMER) {
+			if (p->reqsipoptions & SIP_OPT_TIMER) {
 				transmit_response_with_unsupported(p, "420 Option Disabled", req, required);
 				ast_log(LOG_WARNING, "Received SIP INVITE with supported but disabled option: %s\n", required);
 				p->invitestate = INV_COMPLETED;