From: Olle Johansson <oej@edvina.net>
Date: Wed, 6 Dec 2006 12:34:58 +0000 (+0000)
Subject: Don't send Contact in SIP Messages (imported from 1.2/1.4).
X-Git-Tag: 1.6.0-beta1~3^2~3774
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c39f887ac8deee8cc56b4db5c601d54780ade1d0;p=thirdparty%2Fasterisk.git

Don't send Contact in SIP Messages (imported from 1.2/1.4).
Reported by Gunnar at Omnitor.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48318 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e0b4da412f..2e71e7a668 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -5733,9 +5733,10 @@ static int reqprep(struct sip_request *req, struct sip_pvt *p, int sipmethod, in
 		add_header(req, "From", ot);
 		add_header(req, "To", of);
 	}
-	/* Do not add Contact for BYE and Cancel requests */
-	if (sipmethod != SIP_BYE && sipmethod != SIP_CANCEL)
+	/* Do not add Contact for MESSAGE, BYE and Cancel requests */
+	if (sipmethod != SIP_BYE && sipmethod != SIP_CANCEL && sipmethod != SIP_MESSAGE)
 		add_header(req, "Contact", p->our_contact);
+
 	copy_header(req, orig, "Call-ID");
 	add_header(req, "CSeq", tmp);