mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
a6e96998fb
Update to dnsmasq2.76. Refresh patches. Add new patch to fix musl 'poll.h' location warning. Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
--- a/src/dhcp.c
|
|
+++ b/src/dhcp.c
|
|
@@ -147,7 +147,7 @@ void dhcp_packet(time_t now, int pxe_fd)
|
|
ssize_t sz;
|
|
int iface_index = 0, unicast_dest = 0, is_inform = 0;
|
|
int rcvd_iface_index;
|
|
- struct in_addr iface_addr;
|
|
+ struct in_addr iface_addr, *addrp = NULL;
|
|
struct iface_param parm;
|
|
#ifdef HAVE_LINUX_NETWORK
|
|
struct arpreq arp_req;
|
|
@@ -277,11 +277,9 @@ void dhcp_packet(time_t now, int pxe_fd)
|
|
{
|
|
ifr.ifr_addr.sa_family = AF_INET;
|
|
if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 )
|
|
- iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
|
|
- else
|
|
{
|
|
- my_syslog(MS_DHCP | LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name);
|
|
- return;
|
|
+ addrp = &iface_addr;
|
|
+ iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
|
|
}
|
|
|
|
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
|
@@ -300,7 +298,7 @@ void dhcp_packet(time_t now, int pxe_fd)
|
|
parm.relay_local.s_addr = 0;
|
|
parm.ind = iface_index;
|
|
|
|
- if (!iface_check(AF_INET, (struct all_addr *)&iface_addr, ifr.ifr_name, NULL))
|
|
+ if (!iface_check(AF_INET, (struct all_addr *)addrp, ifr.ifr_name, NULL))
|
|
{
|
|
/* If we failed to match the primary address of the interface, see if we've got a --listen-address
|
|
for a secondary */
|
|
@@ -320,6 +318,12 @@ void dhcp_packet(time_t now, int pxe_fd)
|
|
complete_context(match.addr, iface_index, NULL, match.netmask, match.broadcast, &parm);
|
|
}
|
|
|
|
+ if (!addrp)
|
|
+ {
|
|
+ my_syslog(MS_DHCP | LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name);
|
|
+ return;
|
|
+ }
|
|
+
|
|
if (!iface_enumerate(AF_INET, &parm, complete_context))
|
|
return;
|
|
|