kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_sdp_rtp: Fix address family of explicit media_address."

Browse Source
This commit is contained in:
zuul
2016-10-27 22:22:57 -05:00
committed by Gerrit Code Review
parent 24d0907849 7925f60cd9
commit 0fc942e7cd
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/res_pjsip_sdp_rtp.c
View File

@@ -1057,6 +1057,7 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as
pj_pool_t *pool = session->inv_session->pool_prov;
static const pj_str_t STR_IN = { "IN", 2 };
static const pj_str_t STR_IP4 = { "IP4", 3};
static const pj_str_t STR_IP6 = { "IP6", 3};
static const pj_str_t STR_SENDRECV = { "sendrecv", 8 };
static const pj_str_t STR_SENDONLY = { "sendonly", 8 };
pjmedia_sdp_media *media;
@@ -1121,9 +1122,19 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as
}
media->conn->net_type = STR_IN;
/* Connection information will be updated by the multihomed module */
/* Assume that the connection will use IPv4 until proven otherwise */
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;
}
}
ast_rtp_instance_get_local_address(session_media->rtp, &addr);
media->desc.port = direct_media_enabled ? ast_sockaddr_port(&session_media->direct_media_addr) : (pj_uint16_t) ast_sockaddr_port(&addr);
media->desc.port_count = 1;