From 7c87b4c06fd5c317ff5a288d0345824169860bb6 Mon Sep 17 00:00:00 2001 From: "vimala.v" Date: Mon, 12 Oct 2015 12:35:17 +0530 Subject: [PATCH] [JIRA-IOT 722] Removed deprecated socket functions and updated inet_ntop() instead of snprintf() Change-Id: I1efa2129728386728bcee0f3d0859c7343b4fd8f Signed-off-by: vimala.v Reviewed-on: https://gerrit.iotivity.org/gerrit/3795 Reviewed-by: Abhishek Sharma Tested-by: jenkins-iotivity Reviewed-by: Abhishek Pandey Reviewed-by: Jon A. Cruz --- resource/csdk/connectivity/src/ip_adapter/caipserver.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/resource/csdk/connectivity/src/ip_adapter/caipserver.c b/resource/csdk/connectivity/src/ip_adapter/caipserver.c index e5db106..2938c89 100644 --- a/resource/csdk/connectivity/src/ip_adapter/caipserver.c +++ b/resource/csdk/connectivity/src/ip_adapter/caipserver.c @@ -511,7 +511,7 @@ CAResult_t CAIPStartServer(const ca_thread_pool_t threadPool) if (!IPv4MulticastAddress.s_addr) { - (void)inet_aton(IPv4_MULTICAST, &IPv4MulticastAddress); + (void)inet_pton(AF_INET, IPv4_MULTICAST, &IPv4MulticastAddress); (void)inet_pton(AF_INET6, IPv6_MULTICAST_INT, &IPv6MulticastAddressInt); (void)inet_pton(AF_INET6, IPv6_MULTICAST_LNK, &IPv6MulticastAddressLnk); (void)inet_pton(AF_INET6, IPv6_MULTICAST_RLM, &IPv6MulticastAddressRlm); @@ -1076,9 +1076,7 @@ CAResult_t CAGetIPInterfaceInformation(CAEndpoint_t **info, uint32_t *size) eps[j].flags = CA_IPV4; eps[j].port = caglobals.ip.u4.port; - unsigned char *addr= (unsigned char *) &(ifitem->ipv4addr); - snprintf(eps[j].addr, MAX_ADDR_STR_SIZE_CA, "%d.%d.%d.%d", - addr[0], addr[1], addr[2], addr[3]); + inet_ntop(AF_INET, &(ifitem->ipv4addr), eps[j].addr, MAX_ADDR_STR_SIZE_CA); } #ifdef __WITH_DTLS__ @@ -1096,10 +1094,7 @@ CAResult_t CAGetIPInterfaceInformation(CAEndpoint_t **info, uint32_t *size) { eps[j].flags = CA_IPV4 | CA_SECURE; eps[j].port = caglobals.ip.u4s.port; - - unsigned char *addr= (unsigned char *) &(ifitem->ipv4addr); - snprintf(eps[j].addr, MAX_ADDR_STR_SIZE_CA, "%d.%d.%d.%d", - addr[0], addr[1], addr[2], addr[3]); + inet_ntop(AF_INET, &(ifitem->ipv4addr), eps[j].addr, MAX_ADDR_STR_SIZE_CA); } #endif j++; -- 2.7.4