diff options
author | Simon Kelley <simon@thekelleys.org.uk> | 2023-03-20 22:30:11 +0000 |
---|---|---|
committer | Simon Kelley <simon@thekelleys.org.uk> | 2023-03-20 22:30:11 +0000 |
commit | 3fb10cd0d8217b42071ab575c2edaae2554b1780 (patch) | |
tree | 1f850ab4ac7ad309bd9c5f7a839838ce2d09fc9b /src/network.c | |
parent | 0427e371160882a24825df6f4f963961257df952 (diff) | |
parent | ff28a485cf8b592a6c21b39bbb8e42f5bc390685 (diff) | |
download | dnsmasq-3fb10cd0d8217b42071ab575c2edaae2554b1780.tar.gz |
Merge branch 'master' into all-rr-type
Diffstat (limited to 'src/network.c')
-rw-r--r-- | src/network.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/network.c b/src/network.c index 1e41a78..a80d096 100644 --- a/src/network.c +++ b/src/network.c @@ -359,13 +359,8 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label, struct in_addr newaddr = addr->in.sin_addr; if (int_name->flags & INP4) - { - if (netmask.s_addr == 0xffffffff) - continue; - - newaddr.s_addr = (addr->in.sin_addr.s_addr & netmask.s_addr) | - (int_name->proto4.s_addr & ~netmask.s_addr); - } + newaddr.s_addr = (addr->in.sin_addr.s_addr & netmask.s_addr) | + (int_name->proto4.s_addr & ~netmask.s_addr); /* check for duplicates. */ for (lp = int_name->addr; lp; lp = lp->next) @@ -398,10 +393,6 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label, { int i; - /* No sense in doing /128. */ - if (prefixlen == 128) - continue; - for (i = 0; i < 16; i++) { int bits = ((i+1)*8) - prefixlen; |