Skip to content

Commit acf1ca5

Browse files
authored
Enable storing CIDR elements in nftables sets (#3362)
Signed-off-by: Yossi Boaron <[email protected]>
1 parent 27aeabf commit acf1ca5

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

pkg/packetfilter/nftables/namedset.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ func (p *packetFilter) NewNamedSet(set *packetfilter.SetInfo) packetfilter.Named
4242

4343
return &namedSet{
4444
set: knftables.Set{
45-
Name: set.Name,
46-
Type: setType,
45+
Name: set.Name,
46+
Type: setType,
47+
Flags: []knftables.SetFlag{knftables.IntervalFlag},
4748
},
4849
nftables: p.nftables,
4950
}

pkg/packetfilter/nftables/nftables_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -362,17 +362,17 @@ var _ = Describe("Interface", func() {
362362
err := set.Create(true)
363363
Expect(err).To(Succeed())
364364

365-
err = set.AddEntry("entry1", false)
365+
err = set.AddEntry("1.2.3.4", false)
366366
Expect(err).To(Succeed())
367-
assertEntries(set, "entry1")
367+
assertEntries(set, "1.2.3.4")
368368

369-
err = set.AddEntry("entry2", false)
369+
err = set.AddEntry("10.1.2.0/16", false)
370370
Expect(err).To(Succeed())
371-
assertEntries(set, "entry1", "entry2")
371+
assertEntries(set, "1.2.3.4", "10.1.2.0/16")
372372

373-
err = set.DelEntry("entry1")
373+
err = set.DelEntry("1.2.3.4")
374374
Expect(err).To(Succeed())
375-
assertEntries(set, "entry2")
375+
assertEntries(set, "10.1.2.0/16")
376376

377377
err = set.Flush()
378378
Expect(err).To(Succeed())

0 commit comments

Comments
 (0)