[asterisk-commits] oej: trunk r49214 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Jan  2 14:01:34 2007
New Revision: 49214

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49214
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=49214&r1=49213&r2=49214
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Jan  2 14:01:34 2007
@@ -6114,9 +6114,7 @@
 	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);