kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-02 02:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "chan_sip: Prevent extra Session-Expires headers from being added" into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-05-18 15:37:59 -05:00
committed by Gerrit Code Review
parent 3f6ef63099 77e8ec162b
commit 480b8cda30
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_sip.c
View File

@@ -14528,10 +14528,12 @@ static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init,
add_header(&req, "Require", "replaces");
}
/* Add Session-Timers related headers */
if (st_get_mode(p, 0) == SESSION_TIMER_MODE_ORIGINATE
/* Add Session-Timers related headers if not already there */
if (ast_strlen_zero(sip_get_header(&req, "Session-Expires")) &&
(sipmethod == SIP_INVITE || sipmethod == SIP_UPDATE) &&
(st_get_mode(p, 0) == SESSION_TIMER_MODE_ORIGINATE
|| (st_get_mode(p, 0) == SESSION_TIMER_MODE_ACCEPT
&& st_get_se(p, FALSE) != DEFAULT_MIN_SE)) {
&& st_get_se(p, FALSE) != DEFAULT_MIN_SE))) {
char i2astr[10];
if (!p->stimer->st_interval) {