wt/dnsmasq
1
0
Fork 0
mirror of http://thekelleys.org.uk/git/dnsmasq.git synced 2026-10-12 10:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare address and interface index for allowed interface

Browse Source 
If interface is recreated with the same address but different index, it
would not change any other parameter.

Test also address family on incoming TCP queries.
This commit is contained in:
Petr Mensik
2020-04-29 00:04:29 +01:00
committed by Simon Kelley
parent 51cdd1a227
commit 951a22165c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dnsmasq.c
+2 -1
View File
@@ -1824,7 +1824,8 @@ static void check_dns_listeners(time_t now)
addr.addr4 = tcp_addr.in.sin_addr;
for (iface = daemon->interfaces; iface; iface = iface->next)
if (iface->index == if_index)
if (iface->index == if_index &&
iface->addr.sa.sa_family == tcp_addr.sa.sa_family)
break;
if (!iface && !loopback_exception(listener->tcpfd, tcp_addr.sa.sa_family, &addr, intr_name))
src/network.c
+2 -1
View File
@@ -388,10 +388,11 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label,
/* check whether the interface IP has been added already
we call this routine multiple times. */
for (iface = daemon->interfaces; iface; iface = iface->next)
if (sockaddr_isequal(&iface->addr, addr))
if (sockaddr_isequal(&iface->addr, addr) && iface->index == if_index)
{
iface->dad = !!(iface_flags & IFACE_TENTATIVE);
iface->found = 1; /* for garbage collection */
iface->netmask = netmask;
return 1;
}