diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-15 22:06:07 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-15 22:06:07 +0000 |
| commit | 4e59dbbd8512227577acbbc19fc5ce4ba1a5bd2f (patch) | |
| tree | 00d8a9828b9751e22c0ebac9aa4a16a0f4c2fc31 /channels | |
| parent | c3d255a3f900c678eaf4d8b3913b6ce38f5e756b (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.1@206774 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 92e600f2b..502d395a9 100644 --- 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; |