kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-17 02:02:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_sdp_rtp: Fix setting of address type for rtp_ipv6" into 13

Browse Source
This commit is contained in:
Jenkins2
2017-10-25 06:26:27 -05:00
committed by Gerrit Code Review
parent 65b3c68230 4a2575a107
commit 02538548e6
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/res_pjsip_sdp_rtp.c
View File

@@ -1167,6 +1167,7 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as
RAII_VAR(struct ast_format_cap *, caps, NULL, ao2_cleanup); RAII_VAR(struct ast_format_cap *, caps, NULL, ao2_cleanup);
enum ast_media_type media_type = stream_to_media_type(session_media->stream_type); enum ast_media_type media_type = stream_to_media_type(session_media->stream_type);
int use_override_prefs = ast_format_cap_count(session->req_caps); int use_override_prefs = ast_format_cap_count(session->req_caps);
pj_sockaddr ip;
int direct_media_enabled = !ast_sockaddr_isnull(&session_media->direct_media_addr) && int direct_media_enabled = !ast_sockaddr_isnull(&session_media->direct_media_addr) &&
ast_format_cap_count(session->direct_media_cap); ast_format_cap_count(session->direct_media_cap);
@@ -1223,13 +1224,9 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as
media->conn->addr_type = STR_IP4; media->conn->addr_type = STR_IP4;
pj_strdup2(pool, &media->conn->addr, hostip); pj_strdup2(pool, &media->conn->addr, hostip);
if (!ast_strlen_zero(session->endpoint->media.address)) { if ((pj_sockaddr_parse(pj_AF_UNSPEC(), 0, &media->conn->addr, &ip) == PJ_SUCCESS) &&
pj_sockaddr ip; (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;
}
} }
ast_rtp_instance_get_local_address(session_media->rtp, &addr); ast_rtp_instance_get_local_address(session_media->rtp, &addr);