Merged revisions 233471 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r233471 | dvossel | 2009-12-07 12:07:38 -0600 (Mon, 07 Dec 2009) | 9 lines fixes missing Contact header angle brackets (closes issue #16298) Reported by: mgernoth Patches: reg_parse_issue_1.4.diff uploaded by dvossel (license 671) Tested by: dvossel ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@233472 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
26daf50863
commit
86dc66625c
|
@ -9741,7 +9741,9 @@ static int respprep(struct sip_request *resp, struct sip_pvt *p, const char *msg
|
||||||
add_header(resp, "Expires", tmp);
|
add_header(resp, "Expires", tmp);
|
||||||
if (p->expiry) { /* Only add contact if we have an expiry time */
|
if (p->expiry) { /* Only add contact if we have an expiry time */
|
||||||
char contact[SIPBUFSIZE];
|
char contact[SIPBUFSIZE];
|
||||||
snprintf(contact, sizeof(contact), "%s;expires=%d", (p->method == SIP_SUBSCRIBE ? p->our_contact : p->fullcontact), p->expiry);
|
const char *contact_uri = p->method == SIP_SUBSCRIBE ? p->our_contact : p->fullcontact;
|
||||||
|
char *brackets = strchr(contact_uri, '<');
|
||||||
|
snprintf(contact, sizeof(contact), "%s%s%s;expires=%d", brackets ? "" : "<", contact_uri, brackets ? "" : ">", p->expiry);
|
||||||
add_header(resp, "Contact", contact); /* Not when we unregister */
|
add_header(resp, "Contact", contact); /* Not when we unregister */
|
||||||
}
|
}
|
||||||
} else if (!ast_strlen_zero(p->our_contact) && resp_needs_contact(msg, p->method)) {
|
} else if (!ast_strlen_zero(p->our_contact) && resp_needs_contact(msg, p->method)) {
|
||||||
|
|
Loading…
Reference in New Issue