diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-10-25 06:39:29 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-10-25 06:39:29 -0500 |
| commit | 2f2bbbd43f2733bc6a32c4c344c9d23f6cd46680 (patch) | |
| tree | aee2cf4330fb35ef1c7bffa2aafabfc2c9bd9d65 /res | |
| parent | 3333e787ab8661285e0bb69ac248ff5f23f23c43 (diff) | |
| parent | 6f0431798eb1a1cb3eacf8bb07dd1840f47e682d (diff) | |
Merge "res_pjsip_sdp_rtp: Fix setting of address type for rtp_ipv6"
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip_sdp_rtp.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c index 20a219e7e..604fd421e 100644 --- a/res/res_pjsip_sdp_rtp.c +++ b/res/res_pjsip_sdp_rtp.c @@ -1335,6 +1335,7 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as RAII_VAR(struct ast_format_cap *, caps, NULL, ao2_cleanup); enum ast_media_type media_type = session_media->type; struct ast_sip_session_media *session_media_transport; + pj_sockaddr ip; int direct_media_enabled = !ast_sockaddr_isnull(&session_media->direct_media_addr) && ast_format_cap_count(session->direct_media_cap); @@ -1447,13 +1448,9 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as media->conn->addr_type = STR_IP4; pj_strdup2(pool, &media->conn->addr, hostip); - if (!ast_strlen_zero(session->endpoint->media.address)) { - pj_sockaddr ip; - - if ((pj_sockaddr_parse(pj_AF_UNSPEC(), 0, &media->conn->addr, &ip) == PJ_SUCCESS) && - (ip.addr.sa_family == pj_AF_INET6())) { - media->conn->addr_type = STR_IP6; - } + if ((pj_sockaddr_parse(pj_AF_UNSPEC(), 0, &media->conn->addr, &ip) == PJ_SUCCESS) && + (ip.addr.sa_family == pj_AF_INET6())) { + media->conn->addr_type = STR_IP6; } /* Add ICE attributes and candidates */ |