sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix memcpy of host address in netlib_gethostaddr(). From Brennan Ashton

Browse Source
This commit is contained in:
Gregory Nutt 2014-10-17 16:53:15 -06:00
parent 48a185f691
commit b5cb66927d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netutils/netlib/netlib_gethostaddr.c
View File

@ -71,7 +71,7 @@
* ipaddr The location to return the IP address * ipaddr The location to return the IP address
* *
* Return: * Return:
* 0 on sucess; -1 on failure * 0 on success; -1 on failure
* *
****************************************************************************/ ****************************************************************************/
@ -93,14 +93,20 @@ int netlib_gethostaddr(const char *ifname, struct in_addr *addr)
if (!ret) if (!ret)
{ {
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
memcpy(addr, &req.ifr_addr, sizeof(struct in6_addr)); FAR struct sockaddr_in6 *req_addr;
req_addr = (FAR struct sockaddr_in6 *)&req.ifr_addr;
memcpy(addr, &req_addr->sin6_addr, sizeof(struct in6_addr));
#else #else
memcpy(addr, &req.ifr_addr, sizeof(struct in_addr)); FAR struct sockaddr_in *req_addr;
req_addr = (struct sockaddr_in*)&req.ifr_addr;
memcpy(addr, &req_addr->sin_addr, sizeof(struct in_addr));
#endif #endif
} }
close(sockfd); close(sockfd);
} }
} }
return ret; return ret;
} }