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

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 92e600f2b63a7f008a908a8465873169727f8cbd..502d395a98e704292f8bb05ceb1a929f4eb4a800 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -18665,7 +18665,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
        }
 
        /* 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 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
                        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;