From: Olle Johansson <oej@edvina.net>
Date: Tue, 2 Jan 2007 20:01:34 +0000 (+0000)
Subject: Merged revisions 49212 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3576
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d340b7d027fa93f112c939a3c8f6550897c0470;p=thirdparty%2Fasterisk.git

Merged revisions 49212 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49212 | oej | 2007-01-02 20:58:45 +0100 (Tue, 02 Jan 2007) | 2 lines

Small cleanup of add_t38sdp - it's always enabled at that point in the code

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e71af5e12c..4787c1419d 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6114,9 +6114,7 @@ static int add_t38_sdp(struct sip_request *resp, struct sip_pvt *p)
 	ast_build_string(&a_modem_next, &a_modem_left, "a=T38FaxMaxDatagram:%d\r\n",x);
 	if (p->t38.jointcapability != T38FAX_UDP_EC_NONE)
 		ast_build_string(&a_modem_next, &a_modem_left, "a=T38FaxUdpEC:%s\r\n", (p->t38.jointcapability & T38FAX_UDP_EC_REDUNDANCY) ? "t38UDPRedundancy" : "t38UDPFEC");
-	len = strlen(v) + strlen(s) + strlen(o) + strlen(c) + strlen(t);
-	if (p->udptl)
-		len += strlen(m_modem) + strlen(a_modem);
+	len = strlen(v) + strlen(s) + strlen(o) + strlen(c) + strlen(t) + strlen(m_modem) + strlen(a_modem);
 	add_header(resp, "Content-Type", "application/sdp");
 	add_header_contentLength(resp, len);
 	add_line(resp, v);