diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2016-05-20 04:17:00 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2016-05-20 04:17:00 +0000 |
| commit | 58d6c60c881d265cee8c5ca5dbaad545ff44e995 (patch) | |
| tree | b2bb5a9c72e01491d8dd6bce70d3a4c6c1ab4750 /pjnath | |
| parent | 2e1173b56db0083559b4bc09e00d27d03dbad8bc (diff) | |
Re #1922: Replace IPv4 specific APIs as per Apple's recommendations
https://developer.apple.com/library/ios/documentation/NetworkingInternetWeb/Conceptual/NetworkingOverview/UnderstandingandPreparingfortheIPv6Transition/UnderstandingandPreparingfortheIPv6Transition.html#//apple_ref/doc/uid/TP40010220-CH213-SW27
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5311 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath')
| -rw-r--r-- | pjnath/src/pjnath/nat_detect.c | 11 | ||||
| -rw-r--r-- | pjnath/src/pjnath/stun_msg_dump.c | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/pjnath/src/pjnath/nat_detect.c b/pjnath/src/pjnath/nat_detect.c index a4fa588e..09be94a7 100644 --- a/pjnath/src/pjnath/nat_detect.c +++ b/pjnath/src/pjnath/nat_detect.c @@ -214,6 +214,7 @@ PJ_DEF(pj_status_t) pj_stun_detect_nat_type(const pj_sockaddr_in *server, pj_stun_session_cb sess_cb; pj_ioqueue_callback ioqueue_cb; int addr_len; + char addr[PJ_INET_ADDRSTRLEN]; pj_status_t status; PJ_ASSERT_RETURN(server && stun_cfg, PJ_EINVAL); @@ -286,11 +287,13 @@ PJ_DEF(pj_status_t) pj_stun_detect_nat_type(const pj_sockaddr_in *server, goto on_error; PJ_LOG(5,(sess->pool->obj_name, "Local address is %s:%d", - pj_inet_ntoa(sess->local_addr.sin_addr), + pj_inet_ntop2(pj_AF_INET(), &sess->local_addr.sin_addr, + addr, sizeof(addr)), pj_ntohs(sess->local_addr.sin_port))); PJ_LOG(5,(sess->pool->obj_name, "Server set to %s:%d", - pj_inet_ntoa(server->sin_addr), + pj_inet_ntop2(pj_AF_INET(), &server->sin_addr, addr, + sizeof(addr)), pj_ntohs(server->sin_port))); /* @@ -814,6 +817,7 @@ static pj_status_t send_test(nat_detect_session *sess, pj_uint32_t change_flag) { pj_uint32_t magic, tsx_id[3]; + char addr[PJ_INET_ADDRSTRLEN]; pj_status_t status; sess->result[test_id].executed = PJ_TRUE; @@ -852,7 +856,8 @@ static pj_status_t send_test(nat_detect_session *sess, PJ_LOG(5,(sess->pool->obj_name, "Performing %s to %s:%d", test_names[test_id], - pj_inet_ntoa(sess->cur_server->sin_addr), + pj_inet_ntop2(pj_AF_INET(), &sess->cur_server->sin_addr, + addr, sizeof(addr)), pj_ntohs(sess->cur_server->sin_port))); /* Send the request */ diff --git a/pjnath/src/pjnath/stun_msg_dump.c b/pjnath/src/pjnath/stun_msg_dump.c index 6428d97e..29f37c54 100644 --- a/pjnath/src/pjnath/stun_msg_dump.c +++ b/pjnath/src/pjnath/stun_msg_dump.c @@ -86,6 +86,7 @@ static int print_attr(char *buffer, unsigned length, case PJ_STUN_ATTR_XOR_REFLECTED_FROM: case PJ_STUN_ATTR_ALTERNATE_SERVER: { + char addr[PJ_INET6_ADDRSTRLEN]; const pj_stun_sockaddr_attr *attr; attr = (const pj_stun_sockaddr_attr*)ahdr; @@ -93,8 +94,9 @@ static int print_attr(char *buffer, unsigned length, if (attr->sockaddr.addr.sa_family == pj_AF_INET()) { len = pj_ansi_snprintf(p, end-p, ", IPv4 addr=%s:%d\n", - pj_inet_ntoa(attr->sockaddr.ipv4.sin_addr), - pj_ntohs(attr->sockaddr.ipv4.sin_port)); + pj_sockaddr_print(&attr->sockaddr, + addr, sizeof(addr),0), + pj_sockaddr_get_port(&attr->sockaddr)); } else if (attr->sockaddr.addr.sa_family == pj_AF_INET6()) { len = pj_ansi_snprintf(p, end-p, |