diff options
| author | Jonathan Rose <jrose@digium.com> | 2013-09-19 17:01:09 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2013-09-19 17:01:09 +0000 |
| commit | e89e19c479b8a44b45a48493b41f86f29f769f44 (patch) | |
| tree | 8c1d96f53e9d90a69195ab1116fc1fcb3320cbee /channels/chan_sip.c | |
| parent | d5372f34df8b7075ac28a290ff00a247093fc8ed (diff) | |
chan_sip: Make direct media reinvites for T38 put Asterisk in the media path
Prior to this patch, Asterisk would incorrectly use the previous endpoint
addresses in SDP in spite of providing its own port. T38 is never meant to
be done through directmedia and Asterisk should always be in the media path
for these streams.
(closes issue ASTERISK-17273)
Reported by: Kevin Stewart
(closes issue ASTERISK-18706)
Reported by: Jeremy Kister
Review: https://reviewboard.asterisk.org/r/2853/
........
Merged revisions 399456 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 399457 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 399458 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@399459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index d118adc67..d25a47a66 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -13438,13 +13438,9 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int /* Our T.38 end is */ ast_udptl_get_us(p->udptl, &udptladdr); - /* Determine T.38 UDPTL destination */ - if (!ast_sockaddr_isnull(&p->udptlredirip)) { - ast_sockaddr_copy(&udptldest, &p->udptlredirip); - } else { - ast_sockaddr_copy(&udptldest, &p->ourip); - ast_sockaddr_set_port(&udptldest, ast_sockaddr_port(&udptladdr)); - } + /* We don't use directmedia for T.38, so keep the destination the same as our IP address. */ + ast_sockaddr_copy(&udptldest, &p->ourip); + ast_sockaddr_set_port(&udptldest, ast_sockaddr_port(&udptladdr)); if (debug) { ast_debug(1, "T.38 UDPTL is at %s port %d\n", ast_sockaddr_stringify_addr(&p->ourip), ast_sockaddr_port(&udptladdr)); @@ -13455,9 +13451,9 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int ast_str_append(&m_modem, 0, "m=image %d udptl t38\r\n", ast_sockaddr_port(&udptldest)); - if (!ast_sockaddr_cmp(&udptldest, &dest)) { + if (ast_sockaddr_cmp(&udptldest, &dest)) { ast_str_append(&m_modem, 0, "c=IN %s %s\r\n", - (ast_sockaddr_is_ipv6(&dest) && !ast_sockaddr_is_ipv4_mapped(&dest)) ? + (ast_sockaddr_is_ipv6(&udptldest) && !ast_sockaddr_is_ipv4_mapped(&udptldest)) ? "IP6" : "IP4", ast_sockaddr_stringify_addr_remote(&udptldest)); } |