libnet/ipams/default: normalize addr pools before calling newAddrSpace

This normalization process does two things:

- Unmap IPv4-mapped IPv6 addrs. This ensures such address pools are
part of the IPv4 address space.
- Mask the host ID. This was done by newAddrSpace but `splitByIPFamily`
is already validating / normalizing the address pools.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>

libnetwork/ipams/defaultipam/address_space.go

@@ -2,7 +2,6 @@ package defaultipam
 
 import (
 	"context"
-	"errors"
 	"net/netip"
 	"slices"
 	"sync"
@@ -31,14 +30,6 @@ type addrSpace struct {
 }
 
 func newAddrSpace(predefined []*ipamutils.NetworkToSplit) (*addrSpace, error) {
-	for i, p := range predefined {
-		if !p.Base.IsValid() {
-			return nil, errors.New("newAddrSpace: prefix zero found")
-		}
-
-		predefined[i].Base = p.Base.Masked()
-	}
-
 	slices.SortFunc(predefined, func(a, b *ipamutils.NetworkToSplit) int {
 		return netiputil.PrefixCompare(a.Base, b.Base)
 	})

libnetwork/ipams/defaultipam/allocator.go

@@ -96,6 +96,8 @@ func splitByIPFamily(s []*ipamutils.NetworkToSplit) ([]*ipamutils.NetworkToSplit
 			return []*ipamutils.NetworkToSplit{}, []*ipamutils.NetworkToSplit{}, fmt.Errorf("network at index %d (%v) is not in canonical form", i, n)
 		}
 
+		n.Base, _ = n.Base.Addr().Unmap().Prefix(n.Base.Bits())
+
 		if n.Base.Addr().Is4() {
 			v4 = append(v4, n)
 		} else {