kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 206768 via svnmerge from

Browse Source 
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
This commit is contained in:
David Vossel
2009-07-15 22:06:07 +00:00
parent ee99f1fdc8
commit 19b741deb0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_sip.c
View File

@@ -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;