webnet/tailscale
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

feature/conn25: add the ability to return addresses to the IP Pools

Browse Source 
This will be used as part of the address assignment expiry work.

Updates tailscale/corp#39975

Signed-off-by: Fran Bull <fran@tailscale.com>
This commit is contained in:
Fran Bull
2026-04-21 07:49:43 -07:00
committed by franbull
parent aa740cb393
commit 306fab796c
2 changed files with 156 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
feature/conn25/ippool_test.go
+86 -1
View File
@@ -13,7 +13,7 @@ import (
)
func TestNext(t *testing.T) {
a := ippool{}
a := ipSetIterator{}
_, err := a.next()
if !errors.Is(err, errPoolExhausted) {
t.Fatalf("expected errPoolExhausted, got %v", err)
@@ -58,3 +58,88 @@ func TestNext(t *testing.T) {
t.Fatalf("expected errPoolExhausted, got %v", err)
}
}
// TestReturnAddr tests that if a pool is exhausted, an address can be returned to the
// pool, and then that address will be handed out again.
func TestReturnAddr(t *testing.T) {
addrString := "192.168.0.0"
// There's an IPPool with one address in it.
var isb netipx.IPSetBuilder
isb.AddRange(netipx.IPRangeFrom(netip.MustParseAddr(addrString), netip.MustParseAddr(addrString)))
ipset := must.Get(isb.IPSet())
ipp := newIPPool(ipset)
// The first time we call next we get the address.
addr, err := ipp.next()
if err != nil {
t.Fatalf("expected nil error, got: %v", err)
}
if addr != netip.MustParseAddr(addrString) {
t.Fatalf("want %v, got %v", addrString, addr)
}
// The second time we call next we get errPoolExhausted
_, err = ipp.next()
if !errors.Is(err, errPoolExhausted) {
t.Fatalf("expected errPoolExhausted, got %v", err)
}
// Return the addr to the pool
err = ipp.returnAddr(netip.MustParseAddr(addrString))
if err != nil {
t.Fatal(err)
}
// It's not possible to return addresses that are already in the pool.
err = ipp.returnAddr(netip.MustParseAddr(addrString))
if !errors.Is(err, errAddrExists) {
t.Fatalf("want errAddrExists, got: %v", err)
}
// When we call next we get the returned addr
addrAfterReturn, err := ipp.next()
if err != nil {
t.Fatalf("expected nil error, got: %v", err)
}
if addrAfterReturn != netip.MustParseAddr(addrString) {
t.Fatalf("want %v, got %v", addrString, addrAfterReturn)
}
// You can't return addresses that aren't from the pool.
err = ipp.returnAddr(netip.MustParseAddr("100.100.100.0"))
if !errors.Is(err, errNotOurAddress) {
t.Fatalf("want errNotOurAddress, got: %v", err)
}
}
// TestGettingReturnedAddresses tests that when addresses are returned to the IP Pool
// they are then handed out in the order they were returned.
func TestGettingReturnedAddresses(t *testing.T) {
var isb netipx.IPSetBuilder
isb.AddRange(netipx.IPRangeFrom(netip.MustParseAddr("192.168.0.0"), netip.MustParseAddr("192.168.0.4")))
ipset := must.Get(isb.IPSet())
ipp := newIPPool(ipset)
expectAddrNext := func(addrString string) {
t.Helper()
got, err := ipp.next()
if err != nil {
t.Fatalf("expected nil error, got: %v", err)
}
want := netip.MustParseAddr(addrString)
if want != got {
t.Fatalf("want %v; got %v", want, got)
}
}
expectErrPoolExhaustedNext := func() {
t.Helper()
_, err := ipp.next()
if !errors.Is(err, errPoolExhausted) {
t.Fatalf("expected errPoolExhausted; got %v", err)
}
}
expectAddrNext("192.168.0.0")
expectAddrNext("192.168.0.1")
expectAddrNext("192.168.0.2")
expectAddrNext("192.168.0.3")
expectAddrNext("192.168.0.4")
expectErrPoolExhaustedNext()
ipp.returnAddr(netip.MustParseAddr("192.168.0.2"))
ipp.returnAddr(netip.MustParseAddr("192.168.0.4"))
expectAddrNext("192.168.0.2")
expectAddrNext("192.168.0.4")
expectErrPoolExhaustedNext()
}