mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache

This commit is contained in:
Dimitry Kolyshev 2023-11-22 09:49:32 +02:00
parent 23392d08b1 0f5e8ca56f
commit e7ca515630
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -37,6 +37,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
### Fixed ### Fixed
- `ipset` entries family validation ([#6420]).
- Pre-filling the New static lease window with data ([#6402]). - Pre-filling the New static lease window with data ([#6402]).
- Protection pause timer synchronization ([#5759]). - Protection pause timer synchronization ([#5759]).
@ -44,6 +45,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
[#6362]: https://github.com/AdguardTeam/AdGuardHome/issues/6362 [#6362]: https://github.com/AdguardTeam/AdGuardHome/issues/6362
[#6369]: https://github.com/AdguardTeam/AdGuardHome/issues/6369 [#6369]: https://github.com/AdguardTeam/AdGuardHome/issues/6369
[#6402]: https://github.com/AdguardTeam/AdGuardHome/issues/6402 [#6402]: https://github.com/AdguardTeam/AdGuardHome/issues/6402
[#6420]: https://github.com/AdguardTeam/AdGuardHome/issues/6420
[dnsproxy#169] https://github.com/AdguardTeam/dnsproxy/issues/169 [dnsproxy#169] https://github.com/AdguardTeam/dnsproxy/issues/169

4
internal/ipset/ipset_linux.go
View File

@ -296,6 +296,10 @@ func (m *manager) ipsets(names []string) (sets []props, err error) {
return nil, fmt.Errorf("unknown ipset %q", n) return nil, fmt.Errorf("unknown ipset %q", n)
} }
if p.family != netfilter.ProtoIPv4 && p.family != netfilter.ProtoIPv6 {
return nil, fmt.Errorf("%q unexpected ipset family %q", p.name, p.family)
}
sets = append(sets, p) sets = append(sets, p)
} }