Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove remaining uses of deprecated inet_addr() function.

Browse Source
This commit is contained in:
Petr Menšík
2021-08-10 22:21:01 +01:00
committed by Simon Kelley
parent 3ca4995d34
commit fcb4dcaf7c
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/lease-tools/dhcp_lease_time.c
View File

@@ -153,7 +153,11 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
lease.s_addr = inet_addr(argv[1]); if (inet_pton(AF_INET, argv[1], &lease) < 1)
{
fprintf(stderr, "invalid address: %s\n", argv[1]);
exit(1);
}
memset(&packet, 0, sizeof(packet)); memset(&packet, 0, sizeof(packet));
@@ -177,7 +181,7 @@ int main(int argc, char **argv)
*(p++) = OPTION_END; *(p++) = OPTION_END;
dest.sin_family = AF_INET; dest.sin_family = AF_INET;
dest.sin_addr.s_addr = inet_addr("127.0.0.1"); (void)inet_pton(AF_INET, "127.0.0.1", &dest.sin_addr);
dest.sin_port = ntohs(DHCP_SERVER_PORT); dest.sin_port = ntohs(DHCP_SERVER_PORT);
if (sendto(fd, &packet, sizeof(packet), 0, if (sendto(fd, &packet, sizeof(packet), 0,

3
contrib/lease-tools/dhcp_release.c
View File

@@ -288,13 +288,12 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
if (inet_addr(argv[2]) == INADDR_NONE) if (inet_pton(AF_INET, argv[2], &lease.s_addr) < 1)
{ {
perror("invalid ip address"); perror("invalid ip address");
exit(1); exit(1);
} }
lease.s_addr = inet_addr(argv[2]);
server = find_interface(lease, nl, if_nametoindex(argv[1]), fd, &ifr); server = find_interface(lease, nl, if_nametoindex(argv[1]), fd, &ifr);
memset(&packet, 0, sizeof(packet)); memset(&packet, 0, sizeof(packet));

2
src/dhcp.c
View File

@@ -922,7 +922,7 @@ void dhcp_read_ethers(void)
if (!*cp) if (!*cp)
{ {
if ((addr.s_addr = inet_addr(ip)) == (in_addr_t)-1) if (inet_pton(AF_INET, ip, &addr.s_addr) < 1)
{ {
my_syslog(MS_DHCP | LOG_ERR, _("bad address at %s line %d"), ETHERSFILE, lineno); my_syslog(MS_DHCP | LOG_ERR, _("bad address at %s line %d"), ETHERSFILE, lineno);
continue; continue;

2
src/network.c
View File

@@ -1688,7 +1688,7 @@ int reload_servers(char *fname)
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
memset(&source_addr, 0, sizeof(source_addr)); memset(&source_addr, 0, sizeof(source_addr));
if ((addr.in.sin_addr.s_addr = inet_addr(token)) != (in_addr_t) -1) if (inet_pton(AF_INET, token, &addr.in.sin_addr) > 0)
{ {
#ifdef HAVE_SOCKADDR_SA_LEN #ifdef HAVE_SOCKADDR_SA_LEN
source_addr.in.sin_len = addr.in.sin_len = sizeof(source_addr.in); source_addr.in.sin_len = addr.in.sin_len = sizeof(source_addr.in);