diff options
| author | Matthew Jordan <mjordan@digium.com> | 2012-01-17 16:08:43 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2012-01-17 16:08:43 +0000 |
| commit | f86621eb9364fe11186d844ed1f774cb8b03c43e (patch) | |
| tree | aa564bc11505f1be18659513e7635b201870a08c | |
| parent | 141dd18848277e2f49c466b057edef20824331aa (diff) | |
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.
........
Merged revisions 351233 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 351234 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@351235 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 347b2901e..3a28b03b4 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -6814,12 +6814,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; @@ -6827,7 +6821,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; @@ -7147,6 +7143,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; |