From: David Vossel <dvossel@digium.com>
Date: Mon, 7 Dec 2009 18:07:38 +0000 (+0000)
Subject: fixes missing Contact header angle brackets
X-Git-Tag: 1.4.28-rc1~7^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55e6ac62e9a68ceaf438679362bcb5837aaad618;p=thirdparty%2Fasterisk.git

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/branches/1.4@233471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 098f6b6ad5..a40e5aa004 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6411,7 +6411,9 @@ static int respprep(struct sip_request *resp, struct sip_pvt *p, const char *msg
 		add_header(resp, "Expires", tmp);
 		if (p->expiry) {	/* Only add contact if we have an expiry time */
 			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 */
 		}
 	} else if (!ast_strlen_zero(p->our_contact) && resp_needs_contact(msg, p->method)) {