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 38) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@206768 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
646cd02c09
commit
f91bc197cd
1 changed files with 2 additions and 2 deletions
|
@ -20469,7 +20469,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Session-Timers */
|
/* 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 UAC has requested session-timers for this session. Negotiate
|
||||||
the session refresh interval and who will be the refresher */
|
the session refresh interval and who will be the refresher */
|
||||||
ast_debug(2, "Incoming INVITE with 'timer' option enabled\n");
|
ast_debug(2, "Incoming INVITE with 'timer' option enabled\n");
|
||||||
|
@ -20538,7 +20538,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SESSION_TIMER_MODE_REFUSE:
|
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);
|
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);
|
ast_log(LOG_WARNING, "Received SIP INVITE with supported but disabled option: %s\n", required);
|
||||||
p->invitestate = INV_COMPLETED;
|
p->invitestate = INV_COMPLETED;
|
||||||
|
|
Loading…
Reference in a new issue