DWS/chrony
1
0
Fork 0
mirror of https://gitlab.com/chrony/chrony.git synced 2025-12-03 16:45:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

util: require inet_pton()

Browse Source 
Always use inet_pton() for converting IP addresses. It should be
available on all currently supported systems.
This commit is contained in:
Miroslav Lichvar
2021-03-02 17:28:02 +01:00
parent 579d8c9907
commit 7a02371698
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
util.c
View File

@@ -325,9 +325,10 @@ UTI_IPToString(const IPAddr *addr)
int
UTI_StringToIP(const char *addr, IPAddr *ip)
{
#ifdef FEAT_IPV6
struct in_addr in4;
#ifdef FEAT_IPV6
struct in6_addr in6;
#endif
if (inet_pton(AF_INET, addr, &in4) > 0) {
ip->family = IPADDR_INET4;
@@ -336,23 +337,13 @@ UTI_StringToIP(const char *addr, IPAddr *ip)
return 1;
}
#ifdef FEAT_IPV6
if (inet_pton(AF_INET6, addr, &in6) > 0) {
ip->family = IPADDR_INET6;
ip->_pad = 0;
memcpy(ip->addr.in6, in6.s6_addr, sizeof (ip->addr.in6));
return 1;
}
#else
unsigned long a, b, c, d, n;
n = sscanf(addr, "%lu.%lu.%lu.%lu", &a, &b, &c, &d);
if (n == 4) {
ip->family = IPADDR_INET4;
ip->_pad = 0;
ip->addr.in4 = ((a & 0xff) << 24) | ((b & 0xff) << 16) |
((c & 0xff) << 8) | (d & 0xff);
return 1;
}
#endif
return 0;