From: Matthew Jordan <mjordan@digium.com>
Date: Tue, 17 Jan 2012 16:06:42 +0000 (+0000)
Subject: Fix udptl issue with initial INVITE introduced by r351027
X-Git-Tag: 1.8.10.0-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec4728052077a11f758932639289867be9a290dc;p=thirdparty%2Fasterisk.git

Fix udptl issue with initial INVITE introduced by r351027

When an inital INVITE occurs that contains image media, a channel
is not yet associated with the SIP dialog.  The file descriptor
associated with the udptl session needs to be set in
initialize_udptl or in sip_new to account for this scenario.

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 071bd8c2e7..7b7832bf07 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6772,12 +6772,6 @@ static int initialize_udptl(struct sip_pvt *p)
 		return 1;
 	}
 
-	if (!p->owner) {
-		ast_log(AST_LOG_WARNING, "Attempted to create UDPTL for dialog with no channel - disabling T38 for this dialog\n");
-		ast_clear_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT);
-		return 1;
-	}
-
 	/* If we've already initialized T38, don't take any further action */
 	if (p->udptl) {
 		return 0;
@@ -6785,7 +6779,9 @@ static int initialize_udptl(struct sip_pvt *p)
 
 	/* T38 can be supported by this dialog, create it and set the derived properties */
 	if ((p->udptl = ast_udptl_new_with_bindaddr(sched, io, 0, &bindaddr))) {
-		ast_channel_set_fd(p->owner, 5, ast_udptl_fd(p->udptl));
+		if (p->owner) {
+			ast_channel_set_fd(p->owner, 5, ast_udptl_fd(p->udptl));
+		}
 
 		ast_udptl_setqos(p->udptl, global_tos_audio, global_cos_audio);
 		p->t38_maxdatagram = p->relatedpeer ? p->relatedpeer->t38_maxdatagram : global_t38_maxdatagram;
@@ -7109,6 +7105,9 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
 	if (needtext && i->trtp) {
 		ast_channel_set_fd(tmp, 4, ast_rtp_instance_fd(i->trtp, 0));
 	}
+	if (i->udptl) {
+		ast_channel_set_fd(tmp, 5, ast_udptl_fd(i->udptl));
+	}
 
 	if (state == AST_STATE_RING)
 		tmp->rings = 1;