diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-10-26 11:32:04 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2016-10-26 11:32:04 +0000 |
| commit | f534f67f520397079f1af54358aa4404403025eb (patch) | |
| tree | 67deeced20926fbead6b0db9c9d2beedafb5a2f1 | |
| parent | 2bd8af6d0bc3cc9e08457924f190a76ff8cbb0b7 (diff) | |
res_pjsip_sdp_rtp: Fix address family of explicit media_address.
When an explicit media_address is provided the address family
in the SDP needs to be set to reflect it.
ASTERISK-26309
Change-Id: Ib9350cc91c120eb2f96f0623d3907d12af67eb79
| -rw-r--r-- | res/res_pjsip_sdp_rtp.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c index aaedde423..cf7a8e8ea 100644 --- a/res/res_pjsip_sdp_rtp.c +++ b/res/res_pjsip_sdp_rtp.c @@ -1030,6 +1030,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 }; pjmedia_sdp_media *media; const char *hostip = NULL; @@ -1093,9 +1094,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; |