diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-15 22:06:36 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-15 22:06:36 +0000 |
| commit | 5152443ec0fbd12423a8099dc8c766c4aeb155ed (patch) | |
| tree | 592274d4df41d0b762ce00a560fa5ab3d7b46131 | |
| parent | 822b9cd95aacc95453ea2c692098500be017399c (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@206775 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index d14f9e074..71ff8171f 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -17819,7 +17819,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"); @@ -17888,7 +17888,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; |