diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-10-25 06:44:27 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-10-25 06:44:27 -0500 |
| commit | b8140176e7471910b1a7c79ad967f4b6c7409988 (patch) | |
| tree | 69e48592cfd7e7449e9537dc08810c7a3689cd61 | |
| parent | 4990048d9d8d7fcbc24c690382f1da7a4e1c05ac (diff) | |
| parent | 942f5ab2c2d6c4ec080ed0960504f3cf0d96f278 (diff) | |
Merge "res_pjsip_sdp_rtp: Fix setting of address type for rtp_ipv6" into 15
| -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 */ |