From: David Vossel <dvossel@digium.com>
Date: Mon, 7 Dec 2009 18:10:01 +0000 (+0000)
Subject: Merged revisions 233472 via svnmerge from
X-Git-Tag: 1.6.1.12-rc1~3^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ec3fc29e7fd2ba548b928703f3a94d49d062e7f;p=thirdparty%2Fasterisk.git

Merged revisions 233472 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r233472 | dvossel | 2009-12-07 12:08:46 -0600 (Mon, 07 Dec 2009) | 15 lines

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 0039216b14..2472af8f41 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8736,7 +8736,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)) {