]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
res_pjsip: Fixed format of IPv6 addresses for external media addresses
authorDanielYK <daniel.heckl@gmail.com>
Wed, 15 Apr 2020 20:13:39 +0000 (22:13 +0200)
committerFriendly Automation <jenkins2@gerrit.asterisk.org>
Tue, 21 Apr 2020 22:35:44 +0000 (17:35 -0500)
ASTERISK-28835

Change-Id: I66289afd164c5cdd6c5caa39e79d629a467e7a26

res/res_pjsip_sdp_rtp.c
res/res_pjsip_session.c

index d30116095a6305b547486b4f0270738832636341..b4e95ab3f2ff7773edb2f1e197a81c43e1f1255c 100644 (file)
@@ -2117,8 +2117,8 @@ static void change_outgoing_sdp_stream_media_address(pjsip_tx_data *tdata, struc
        if (ast_sip_transport_is_nonlocal(transport_state, &our_sdp_addr) && transport_state->localnet) {
                return;
        }
-       ast_debug(5, "Setting media address to %s\n", ast_sockaddr_stringify_host(&transport_state->external_media_address));
-       pj_strdup2(tdata->pool, &stream->conn->addr, ast_sockaddr_stringify_host(&transport_state->external_media_address));
+       ast_debug(5, "Setting media address to %s\n", ast_sockaddr_stringify_addr_remote(&transport_state->external_media_address));
+       pj_strdup2(tdata->pool, &stream->conn->addr, ast_sockaddr_stringify_addr_remote(&transport_state->external_media_address));
 }
 
 /*! \brief Function which stops the RTP instance */
index cfac6c1aaa95f50047b2bfa0e1ebbc8cfe87cae7..b71aa359cfad03c8a3e5df5277721405f9be4be7 100644 (file)
@@ -4510,8 +4510,8 @@ static void session_outgoing_nat_hook(pjsip_tx_data *tdata, struct ast_sip_trans
                 * outgoing session IP is local. If it is, we'll do
                 * rewriting. No localnet configured? Always rewrite. */
                if (ast_sip_transport_is_local(transport_state, &our_sdp_addr) || !transport_state->localnet) {
-                       ast_debug(5, "Setting external media address to %s\n", ast_sockaddr_stringify_host(&transport_state->external_media_address));
-                       pj_strdup2(tdata->pool, &sdp->conn->addr, ast_sockaddr_stringify_host(&transport_state->external_media_address));
+                       ast_debug(5, "Setting external media address to %s\n", ast_sockaddr_stringify_addr_remote(&transport_state->external_media_address));
+                       pj_strdup2(tdata->pool, &sdp->conn->addr, ast_sockaddr_stringify_addr_remote(&transport_state->external_media_address));
                        pj_strassign(&sdp->origin.addr, &sdp->conn->addr);
                }
        }