Skip to content

index: make prefix keys use the canonicalized form #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bimmlerd merged 1 commit into from
Feb 17, 2026
Merged

index: make prefix keys use the canonicalized form #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index/netip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func NetIPAddrString(s string) (Key, error) {

func NetIPPrefix(prefix netip.Prefix) Key {
// Use the 16-byte form plus bits to have a constant-size key.
addrBytes := prefix.Addr().As16()
addrBytes := prefix.Masked().Addr().As16()
return append(addrBytes[:], uint8(prefix.Bits()))
}

Expand Down
22 changes: 22 additions & 0 deletions index/netip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package index

import (
"net/netip"
"testing"
)

func TestNetIPPrefix(t *testing.T) {
k1 := NetIPPrefix(netip.MustParsePrefix("10.0.0.100/8"))
Copy link
Copy Markdown

@derailed derailed Feb 13, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be good to set this up as a table test so we can add more tests in the future and also test non equality.

k2 := NetIPPrefix(netip.MustParsePrefix("10.0.0.0/8"))

if !k1.Equal(k2) {
t.Errorf("expected netip prefix keys to use canonicalized CIDR")
}

k1s, _ := NetIPPrefixString("10.0.0.100/8")
k2s, _ := NetIPPrefixString("10.0.0.0/8")

if !k1s.Equal(k2s) {
t.Errorf("expected netip prefix string keys to use canonicalized CIDR")
}
}