InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon/internal: move netiputil from libnetwork

Browse Source 
These utilities are going to be needed elsewhere in the daemon to handle
netip values from API requests.

Signed-off-by: Cory Snider <csnider@mirantis.com>
This commit is contained in:
Cory Snider
2025-09-17 18:36:05 -04:00
committed by Sebastiaan van Stijn
parent 470f5b50a5
commit 46ab36ae46
17 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
daemon/libnetwork/internal/netiputil/netiputil.go → daemon/internal/netiputil/netiputil.go
View File

0
daemon/libnetwork/internal/netiputil/netiputil_test.go → daemon/internal/netiputil/netiputil_test.go
View File

2
daemon/libnetwork/drivers/bridge/bridge_linux.go
View File

@@ -13,6 +13,7 @@ import (
"syscall"
"github.com/containerd/log"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/daemon/internal/otelutil"
"github.com/moby/moby/v2/daemon/internal/sliceutil"
"github.com/moby/moby/v2/daemon/internal/stringid"
@@ -22,7 +23,6 @@ import (
"github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge/internal/iptabler"
"github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge/internal/nftabler"
"github.com/moby/moby/v2/daemon/libnetwork/drvregistry"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/internal/nftables"
"github.com/moby/moby/v2/daemon/libnetwork/iptables"
"github.com/moby/moby/v2/daemon/libnetwork/netlabel"

2
daemon/libnetwork/drivers/bridge/bridge_linux_test.go
View File

@@ -14,10 +14,10 @@ import (
cerrdefs "github.com/containerd/errdefs"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/driverapi"
"github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge/internal/firewaller"
"github.com/moby/moby/v2/daemon/libnetwork/drvregistry"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/ipamapi"
"github.com/moby/moby/v2/daemon/libnetwork/ipams/defaultipam"
"github.com/moby/moby/v2/daemon/libnetwork/ipamutils"

2
daemon/libnetwork/drivers/bridge/interface_linux.go
View File

@@ -8,7 +8,7 @@ import (
"syscall"
"github.com/containerd/log"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/nlwrap"
"github.com/moby/moby/v2/errdefs"
"github.com/vishvananda/netlink"

2
daemon/libnetwork/drivers/overlay/joinleave.go
View File

@@ -11,8 +11,8 @@ import (
"github.com/containerd/log"
"github.com/gogo/protobuf/proto"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/driverapi"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/netlabel"
"github.com/moby/moby/v2/daemon/libnetwork/ns"
"github.com/moby/moby/v2/daemon/libnetwork/osl"

2
daemon/libnetwork/drivers/overlay/ov_endpoint.go
View File

@@ -9,9 +9,9 @@ import (
"net/netip"
"github.com/containerd/log"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/driverapi"
"github.com/moby/moby/v2/daemon/libnetwork/internal/hashable"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/netutils"
"github.com/moby/moby/v2/daemon/libnetwork/ns"
)

2
daemon/libnetwork/drivers/overlay/ov_network.go
View File

@@ -15,11 +15,11 @@ import (
"sync"
"github.com/containerd/log"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/driverapi"
"github.com/moby/moby/v2/daemon/libnetwork/drivers/overlay/overlayutils"
"github.com/moby/moby/v2/daemon/libnetwork/internal/countmap"
"github.com/moby/moby/v2/daemon/libnetwork/internal/hashable"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/netlabel"
"github.com/moby/moby/v2/daemon/libnetwork/nlwrap"
"github.com/moby/moby/v2/daemon/libnetwork/ns"

2
daemon/libnetwork/internal/addrset/addrset.go
View File

@@ -9,8 +9,8 @@ import (
"net/netip"
"strings"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/bitmap"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/ipbits"
)

2
daemon/libnetwork/ipams/defaultipam/address_space.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/containerd/log"
"github.com/moby/moby/api/types/network"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/internal/uint128"
"github.com/moby/moby/v2/daemon/libnetwork/ipamapi"
"github.com/moby/moby/v2/daemon/libnetwork/ipamutils"

2
daemon/libnetwork/ipams/defaultipam/allocator.go
View File

@@ -9,8 +9,8 @@ import (
"github.com/containerd/log"
"github.com/moby/moby/api/types/network"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/internal/addrset"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/ipamapi"
"github.com/moby/moby/v2/daemon/libnetwork/ipamutils"
"github.com/moby/moby/v2/daemon/libnetwork/types"

2
daemon/libnetwork/ipams/defaultipam/allocator_test.go
View File

@@ -14,8 +14,8 @@ import (
"testing"
"time"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/internal/addrset"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/ipamapi"
"github.com/moby/moby/v2/daemon/libnetwork/ipamutils"
"github.com/moby/moby/v2/daemon/libnetwork/types"

2
daemon/libnetwork/ipams/defaultipam/structures_test.go
View File

@@ -4,7 +4,7 @@ import (
"net/netip"
"testing"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"gotest.tools/v3/assert"
)

2
daemon/libnetwork/netutils/utils_linux.go
View File

@@ -8,7 +8,7 @@ import (
"os"
"slices"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/internal/resolvconf"
"github.com/moby/moby/v2/daemon/libnetwork/nlwrap"
"github.com/moby/moby/v2/daemon/libnetwork/ns"

2
daemon/libnetwork/netutils/utils_linux_test.go
View File

@@ -9,7 +9,7 @@ import (
"testing"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/internal/testutil/netnsutils"
"github.com/vishvananda/netlink"
"gotest.tools/v3/assert"

2
daemon/libnetwork/network.go
View File

@@ -17,11 +17,11 @@ import (
cerrdefs "github.com/containerd/errdefs"
"github.com/containerd/log"
"github.com/moby/moby/api/types/network"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/daemon/internal/sliceutil"
"github.com/moby/moby/v2/daemon/internal/stringid"
"github.com/moby/moby/v2/daemon/libnetwork/datastore"
"github.com/moby/moby/v2/daemon/libnetwork/driverapi"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/internal/setmatrix"
"github.com/moby/moby/v2/daemon/libnetwork/ipamapi"
"github.com/moby/moby/v2/daemon/libnetwork/ipams/defaultipam"

2
daemon/libnetwork/resolver.go
View File

@@ -15,7 +15,7 @@ import (
"github.com/containerd/log"
"github.com/miekg/dns"
"github.com/moby/moby/v2/daemon/libnetwork/internal/netiputil"
"github.com/moby/moby/v2/daemon/internal/netiputil"
"github.com/moby/moby/v2/daemon/libnetwork/types"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"