Skip to content
Snippets Groups Projects
Commit ecc55769 authored by Adrien Béraud's avatar Adrien Béraud Committed by Adrien Béraud
Browse files

sipvoiplink: cleanup

Change-Id: Ibdb2592704bd36cb95d165237507fe1fd3e7d215
parent a5d4bfb8
Branches
No related tags found
No related merge requests found
......@@ -1646,7 +1646,7 @@ SIPVoIPLink::findLocalAddressFromSTUN(pjsip_transport* transport,
pj_sock_t sipSocket = pjsip_udp_transport_get_socket(transport);
const pjstun_setting stunOpt
= {PJ_TRUE, localIp.getFamily(), *stunServerName, stunPort, *stunServerName, stunPort};
const pj_status_t stunStatus = pjstun_get_mapped_addr2(&cp_.factory,
pj_status_t stunStatus = pjstun_get_mapped_addr2(&cp_.factory,
&stunOpt,
1,
&sipSocket,
......@@ -1654,9 +1654,8 @@ SIPVoIPLink::findLocalAddressFromSTUN(pjsip_transport* transport,
switch (stunStatus) {
case PJLIB_UTIL_ESTUNNOTRESPOND:
JAMI_ERR("No response from STUN server %.*s",
(int) stunServerName->slen,
stunServerName->ptr);
JAMI_ERROR("No response from STUN server {:s}",
sip_utils::as_view(*stunServerName));
return false;
case PJLIB_UTIL_ESTUNSYMMETRIC:
......@@ -1665,18 +1664,13 @@ SIPVoIPLink::findLocalAddressFromSTUN(pjsip_transport* transport,
case PJ_SUCCESS:
port = pj_sockaddr_in_get_port(&mapped_addr);
addr = IpAddr((const sockaddr_in&) mapped_addr).toString();
JAMI_DBG("STUN server %.*s replied '%s:%u'",
(int) stunServerName->slen,
stunServerName->ptr,
addr.c_str(),
port);
addr = IpAddr((const sockaddr_in&) mapped_addr).toString(true);
JAMI_DEBUG("STUN server {:s} replied '{}'", sip_utils::as_view(*stunServerName), addr);
return true;
default: // use given address, silent any not handled error
JAMI_WARN("Error from STUN server %.*s, using source address",
(int) stunServerName->slen,
stunServerName->ptr);
JAMI_WARNING("Error from STUN server {:s}, using source address",
sip_utils::as_view(*stunServerName));
return false;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment