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

Merge "chan_sip: Fix SUBSCRIBE with missing "Expires" header."

Browse Source
This commit is contained in:
Joshua Colp
2017-10-25 08:17:40 -05:00
committed by Gerrit Code Review
parent 61aeeb6d52 6474de5f72
commit 0436fe18f0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_sip.c
View File

@@ -28672,7 +28672,13 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
p->lastinvite = seqno;
}
if (!p->needdestroy) {
p->expiry = atoi(sip_get_header(req, "Expires"));
const char *expires_str = sip_get_header(req, "Expires");
if (ast_strlen_zero(expires_str)) {
p->expiry = default_expiry;
} else {
p->expiry = atoi(expires_str);
}
/* check if the requested expiry-time is within the approved limits from sip.conf */
if (p->expiry > max_subexpiry) {