Skip to content

rcmgr: use netip.Prefix as map key instead of string #3264

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
sukunrt merged 1 commit into from
Apr 4, 2025
Merged

rcmgr: use netip.Prefix as map key instead of string #3264

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
29 changes: 13 additions & 16 deletions p2p/host/resource-manager/conn_limiter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ type connLimiter struct {
// Subnet limits.
connLimitPerSubnetV4 []ConnLimitPerSubnet
connLimitPerSubnetV6 []ConnLimitPerSubnet
ip4connsPerLimit []map[string]int
ip6connsPerLimit []map[string]int
ip4connsPerLimit []map[netip.Prefix]int
ip6connsPerLimit []map[netip.Prefix]int
}

func newConnLimiter() *connLimiter {
Expand Down Expand Up @@ -180,7 +180,7 @@ func (cl *connLimiter) addConn(ip netip.Addr) bool {
}

if len(connsPerLimit) == 0 && len(limits) > 0 {
connsPerLimit = make([]map[string]int, len(limits))
connsPerLimit = make([]map[netip.Prefix]int, len(limits))
if isIP6 {
cl.ip6connsPerLimit = connsPerLimit
} else {
Expand All @@ -193,13 +193,12 @@ func (cl *connLimiter) addConn(ip netip.Addr) bool {
if err != nil {
return false
}
masked := prefix.String()
counts, ok := connsPerLimit[i][masked]
counts, ok := connsPerLimit[i][prefix]
if !ok {
if connsPerLimit[i] == nil {
connsPerLimit[i] = make(map[string]int)
connsPerLimit[i] = make(map[netip.Prefix]int)
}
connsPerLimit[i][masked] = 0
connsPerLimit[i][prefix] = 0
}
if counts+1 > limit.ConnCount {
return false
Expand All @@ -209,8 +208,7 @@ func (cl *connLimiter) addConn(ip netip.Addr) bool {
// All limit checks passed, now we update the counts
for i, limit := range limits {
prefix, _ := ip.Prefix(limit.PrefixLength)
masked := prefix.String()
connsPerLimit[i][masked]++
connsPerLimit[i][prefix]++
}

return true
Expand Down Expand Up @@ -258,7 +256,7 @@ func (cl *connLimiter) rmConn(ip netip.Addr) {
if len(connsPerLimit) == 0 && len(limits) > 0 {
// Initialize just in case. We should have already initialized in
// addConn, but if the callers calls rmConn first we don't want to panic
connsPerLimit = make([]map[string]int, len(limits))
connsPerLimit = make([]map[netip.Prefix]int, len(limits))
if isIP6 {
cl.ip6connsPerLimit = connsPerLimit
} else {
Expand All @@ -273,16 +271,15 @@ func (cl *connLimiter) rmConn(ip netip.Addr) {
log.Errorf("unexpected error getting prefix: %v", err)
continue
}
masked := prefix.String()
counts, ok := connsPerLimit[i][masked]
counts, ok := connsPerLimit[i][prefix]
if !ok || counts == 0 {
// Unexpected, but don't panic
log.Errorf("unexpected conn count for %s ok=%v count=%v", masked, ok, counts)
log.Errorf("unexpected conn count for %s ok=%v count=%v", prefix, ok, counts)
continue
}
connsPerLimit[i][masked]--
if connsPerLimit[i][masked] <= 0 {
delete(connsPerLimit[i], masked)
connsPerLimit[i][prefix]--
if connsPerLimit[i][prefix] <= 0 {
delete(connsPerLimit[i], prefix)
}
}
}
16 changes: 16 additions & 0 deletions p2p/host/resource-manager/conn_limiter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,22 @@ func TestItLimits(t *testing.T) {
require.NoError(t, err)
require.True(t, cl.addConn(otherIP))
})

t.Run("IPv4 removal", func(t *testing.T) {
ip, err := netip.ParseAddr("1.2.3.4")
require.NoError(t, err)
cl := newConnLimiter()
cl.connLimitPerSubnetV4[0].ConnCount = 1
require.True(t, cl.addConn(ip))

// should fail the second time
require.False(t, cl.addConn(ip))
// remove the connection
cl.rmConn(ip)
// should succeed now
require.True(t, cl.addConn(ip))
})

t.Run("IPv6", func(t *testing.T) {
ip, err := netip.ParseAddr("1:2:3:4::1")
require.NoError(t, err)
Expand Down