Skip to content

Commit

Permalink
Pull request 2074: 6420-ipset-imp-validation
Browse files Browse the repository at this point in the history
Closes AdguardTeam#6420.

Squashed commit of the following:

commit 5494df6
Merge: 5e2ab6c db42254
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Nov 21 16:13:15 2023 +0300

    Merge branch 'master' into 6420-ipset-imp-validation

commit 5e2ab6c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Nov 20 20:45:11 2023 +0300

    ipset: imp err msg

commit 2696372
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Nov 17 13:59:33 2023 +0300

    all: imp docs

commit 0cb0e35
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Nov 16 18:20:35 2023 +0300

    all: upd chlog

commit 969f84a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 15 20:11:16 2023 +0300

    ipset: add type name
  • Loading branch information
schzhn authored and annguyen0 committed Nov 27, 2023
1 parent 141a427 commit a1308eb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@ NOTE: Add new changes BELOW THIS COMMENT.

### Fixed

- `ipset` entries family validation ([#6420]).
- Pre-filling the New static lease window with data ([#6402]).
- Protection pause timer synchronization ([#5759]).

[#5759]: https://github.com/AdguardTeam/AdGuardHome/issues/5759
[#6369]: https://github.com/AdguardTeam/AdGuardHome/issues/6369
[#6402]: https://github.com/AdguardTeam/AdGuardHome/issues/6402
[#6420]: https://github.com/AdguardTeam/AdGuardHome/issues/6420

<!--
NOTE: Add new changes ABOVE THIS COMMENT.
Expand Down
4 changes: 4 additions & 0 deletions internal/ipset/ipset_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ func (m *manager) ipsets(names []string) (sets []props, err error) {
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)
}

Expand Down

0 comments on commit a1308eb

Please sign in to comment.