kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip_sdp_rtp: Fix setting of address type for rtp_ipv6

Browse Source 
create_outgoing_sdp_stream was setting "addr_type = STR_IP6" only
when an ipv6 media_address was specified on the endpoint.  If
rtp_ipv6 was set and ast_sip_get_host_ip_string returned an ipv6
address, we were leaving the addr_type set at the default of
STR_IP4.  This caused the address type to be set incorrectly on the
"o" and "c" SDP attributes even though the address was set
correctly.  Some clients don't like the mismatch.

 * Removed the test for endpoint/media_address and now check all
   addresses for ipv6.

ASTERISK-27198
Reported by: Martin Cisárik

Change-Id: I5214fc31b728117842243807e7927a319cf77592
This commit is contained in:
George Joseph
2017-10-23 11:23:04 -06:00
parent 8b719a3e48
commit 6f0431798e
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/res_pjsip_sdp_rtp.c
View File

@@ -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); RAII_VAR(struct ast_format_cap *, caps, NULL, ao2_cleanup);
enum ast_media_type media_type = session_media->type; enum ast_media_type media_type = session_media->type;
struct ast_sip_session_media *session_media_transport; struct ast_sip_session_media *session_media_transport;
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);
@@ -1447,14 +1448,10 @@ 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)) {
pj_sockaddr ip;
if ((pj_sockaddr_parse(pj_AF_UNSPEC(), 0, &media->conn->addr, &ip) == PJ_SUCCESS) && if ((pj_sockaddr_parse(pj_AF_UNSPEC(), 0, &media->conn->addr, &ip) == PJ_SUCCESS) &&
(ip.addr.sa_family == pj_AF_INET6())) { (ip.addr.sa_family == pj_AF_INET6())) {
media->conn->addr_type = STR_IP6; media->conn->addr_type = STR_IP6;
} }
}
/* Add ICE attributes and candidates */ /* Add ICE attributes and candidates */
add_ice_to_stream(session, session_media, pool, media, 1); add_ice_to_stream(session, session_media, pool, media, 1);