From: Joshua Colp <jcolp@digium.com>
Date: Wed, 24 Jun 2009 18:10:17 +0000 (+0000)
Subject: Merged revisions 202925 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10d49a7cc8aa95c61337a947d1d67afb629ea181;p=thirdparty%2Fasterisk.git

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

........
  r202925 | file | 2009-06-24 15:08:17 -0300 (Wed, 24 Jun 2009) | 2 lines

  Ensure the default settings are applied for T.38 when we set it up for a peer.
........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 710d591cf8..03e35cbc39 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -18392,8 +18392,9 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
 		}
 
 		/* If T38 is needed but not present, then make it magically appear */
-		if (ast_test_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT) && !p->udptl) {
-			p->udptl = ast_udptl_new_with_bindaddr(sched, io, 0, bindaddr.sin_addr);
+		if (ast_test_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT) && !p->udptl && (p->udptl = ast_udptl_new_with_bindaddr(sched, io, 0, bindaddr.sin_addr))) {
+			set_t38_capabilities(p);
+			p->t38.jointcapability = p->t38.capability;
 		}
 
 		/* We have a succesful authentication, process the SDP portion if there is one */