mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-31 16:35:44 +00:00
7541d30c9c
f52bb5b fix previous commit 18eac67 Fix entries in /etc/hosts disabling static leases. f8c77ed Fix removal of DHCP_CLIENT_MAC options from DHCPv6 relay replies. 4bf62f6 Tidy cache_blockdata_free() 9c0d445 Fix e7bfd556c079c8b5e7425aed44abc35925b24043 to actually work. 2896e24 Check for not(DS or DNSKEY) in is_outdated_cname_pointer() a90f09d Fix crash freeing negative SRV cache entries. 5b99eae Cache SRV records. 2daca52 Fix typo in ra-param man page section. 2c59473 File logic bug in cache-marshalling code. Introduced a couple of commits back. cc921df Remove nested struct/union in cache records and all_addr. ab194ed Futher address union tidying. 65a01b7 Tidy address-union handling: move class into explicit argument. bde4647 Tidy all_addr union, merge log and rcode fields. e7bfd55 Alter DHCP address selection after DECLINE in consec-addr mode. Avoid offering the same address after a recieving a DECLINE message to stop an infinite protocol loop. This has long been done in default address allocation mode: this adds similar behaviour when allocaing addresses consecutively. The most relevant fix for openwrt is 18eac67 (& my own local f52bb5b which fixes a missing bracket silly) To quote the patch: It is possible for a config entry to have one address family specified by a dhcp-host directive and the other added from /etc/hosts. This is especially common on OpenWrt because it uses odhcpd for DHCPv6 and IPv6 leases are imported into dnsmasq via a hosts file. To handle this case there need to be separate *_HOSTS flags for IPv4 and IPv6. Otherwise when the hosts file is reloaded it will clear the CONFIG_ADDR(6) flag which was set by the dhcp-host directive. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From 3becf468bad699bfdcb2d18d553bc72d4c79e23c Mon Sep 17 00:00:00 2001
|
||
From: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
|
||
Date: Wed, 12 Dec 2018 12:00:19 +0000
|
||
Subject: [PATCH 15/30] fix ipv6 ipset bug in master
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Hi Simon,
|
||
|
||
Another one fallen out of the openwrt tree shake :-)
|
||
|
||
ipv6 ipset addresses weren’t being set correctly. patch attached
|
||
|
||
Cheers,
|
||
|
||
Kevin D-B
|
||
|
||
012C ACB2 28C6 C53E 9775 9123 B3A2 389B 9DE2 334A
|
||
From b50fc0491e374186f982b019f293379955afd203 Mon Sep 17 00:00:00 2001
|
||
From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
||
Date: Wed, 12 Dec 2018 11:35:12 +0000
|
||
Subject: [PATCH] ipset fix ternary order swap
|
||
|
||
ee87504 Remove ability to compile without IPv6 support introduced a
|
||
ternary operator for ip address size. Unfortunately the true/false
|
||
order was incorrect which meant ipv6 ipset addresses were added
|
||
incorrectly.
|
||
|
||
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
||
---
|
||
src/ipset.c | 2 +-
|
||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
||
--- a/src/ipset.c
|
||
+++ b/src/ipset.c
|
||
@@ -120,7 +120,7 @@ static int new_add_to_ipset(const char *
|
||
struct my_nfgenmsg *nfg;
|
||
struct my_nlattr *nested[2];
|
||
uint8_t proto;
|
||
- int addrsz = (af == AF_INET6) ? INADDRSZ : IN6ADDRSZ;
|
||
+ int addrsz = (af == AF_INET6) ? IN6ADDRSZ : INADDRSZ;
|
||
|
||
if (strlen(setname) >= IPSET_MAXNAMELEN)
|
||
{
|