@@ -12,7 +12,7 @@ import (

 // Backend is all the methods that need to be implemented

 // to provide network specific functionality.

 type Backend interface {

-	FindNetwork(idName string) (libnetwork.Network, error)

+	FindNetwork(idName string) (*libnetwork.Network, error)

 	GetNetworks(filters.Args, types.NetworkListConfig) ([]types.NetworkResource, error)

 	CreateNetwork(nc types.NetworkCreateRequest) (*types.NetworkCreateResponse, error)

 	ConnectContainerToNetwork(containerName, networkName string, endpointConfig *network.EndpointSettings) error

@@ -95,7 +95,7 @@ type lnInterface struct {

 	provider *bridgeProvider

 }

-func (iface *lnInterface) init(c *libnetwork.Controller, n libnetwork.Network) {

+func (iface *lnInterface) init(c *libnetwork.Controller, n *libnetwork.Network) {

 	defer close(iface.ready)

 	id := identity.NewID()

@@ -35,7 +35,7 @@ import (

 type Backend interface {

 	CreateManagedNetwork(clustertypes.NetworkCreateRequest) error

 	DeleteManagedNetwork(networkID string) error

-	FindNetwork(idName string) (libnetwork.Network, error)

+	FindNetwork(idName string) (*libnetwork.Network, error)

 	SetupIngress(clustertypes.NetworkCreateRequest, string) (<-chan struct{}, error)

 	ReleaseIngress() (<-chan struct{}, error)

 	CreateManagedContainer(ctx context.Context, config types.ContainerCreateConfig) (container.CreateResponse, error)

@@ -247,7 +247,7 @@ func (daemon *Daemon) buildSandboxOptions(cfg *config.Config, container *contain

 	return sboxOptions, nil

 }

-func (daemon *Daemon) updateNetworkSettings(container *container.Container, n libnetwork.Network, endpointConfig *networktypes.EndpointSettings) error {

+func (daemon *Daemon) updateNetworkSettings(container *container.Container, n *libnetwork.Network, endpointConfig *networktypes.EndpointSettings) error {

 	if container.NetworkSettings == nil {

 		container.NetworkSettings = &network.Settings{}

 	}

@@ -293,7 +293,7 @@ func (daemon *Daemon) updateNetworkSettings(container *container.Container, n li

 	return nil

 }

-func (daemon *Daemon) updateEndpointNetworkSettings(cfg *config.Config, container *container.Container, n libnetwork.Network, ep *libnetwork.Endpoint) error {

+func (daemon *Daemon) updateEndpointNetworkSettings(cfg *config.Config, container *container.Container, n *libnetwork.Network, ep *libnetwork.Endpoint) error {

 	if err := buildEndpointInfo(container.NetworkSettings, n, ep); err != nil {

 		return err

 	}

@@ -320,7 +320,7 @@ func (daemon *Daemon) updateNetwork(cfg *config.Config, container *container.Con

 	}

 	// Find if container is connected to the default bridge network

-	var n libnetwork.Network

+	var n *libnetwork.Network

 	for name, v := range container.NetworkSettings.Networks {

 		sn, err := daemon.FindNetwork(getNetworkID(name, v.EndpointSettings))

 		if err != nil {

@@ -351,7 +351,7 @@ func (daemon *Daemon) updateNetwork(cfg *config.Config, container *container.Con

 	return nil

 }

-func (daemon *Daemon) findAndAttachNetwork(container *container.Container, idOrName string, epConfig *networktypes.EndpointSettings) (libnetwork.Network, *networktypes.NetworkingConfig, error) {

+func (daemon *Daemon) findAndAttachNetwork(container *container.Container, idOrName string, epConfig *networktypes.EndpointSettings) (*libnetwork.Network, *networktypes.NetworkingConfig, error) {

 	id := getNetworkID(idOrName, epConfig)

 	n, err := daemon.FindNetwork(id)

@@ -451,7 +451,7 @@ func (daemon *Daemon) findAndAttachNetwork(container *container.Container, idOrN

 // updateContainerNetworkSettings updates the network settings

 func (daemon *Daemon) updateContainerNetworkSettings(container *container.Container, endpointsConfig map[string]*networktypes.EndpointSettings) {

-	var n libnetwork.Network

+	var n *libnetwork.Network

 	mode := container.HostConfig.NetworkMode

 	if container.Config.NetworkDisabled || mode.IsContainer() {

@@ -622,7 +622,7 @@ func hasUserDefinedIPAddress(ipamConfig *networktypes.EndpointIPAMConfig) bool {

 }

 // User specified ip address is acceptable only for networks with user specified subnets.

-func validateNetworkingConfig(n libnetwork.Network, epConfig *networktypes.EndpointSettings) error {

+func validateNetworkingConfig(n *libnetwork.Network, epConfig *networktypes.EndpointSettings) error {

 	if n == nil || epConfig == nil {

 		return nil

 	}

@@ -684,7 +684,7 @@ func cleanOperationalData(es *network.EndpointSettings) {

 	}

 }

-func (daemon *Daemon) updateNetworkConfig(container *container.Container, n libnetwork.Network, endpointConfig *networktypes.EndpointSettings, updateSettings bool) error {

+func (daemon *Daemon) updateNetworkConfig(container *container.Container, n *libnetwork.Network, endpointConfig *networktypes.EndpointSettings, updateSettings bool) error {

 	if containertypes.NetworkMode(n.Name()).IsUserDefined() {

 		addShortID := true

 		shortID := stringid.TruncateID(container.ID)

@@ -835,7 +835,7 @@ func (daemon *Daemon) connectToNetwork(cfg *config.Config, container *container.

 	return nil

 }

-func updateJoinInfo(networkSettings *network.Settings, n libnetwork.Network, ep *libnetwork.Endpoint) error {

+func updateJoinInfo(networkSettings *network.Settings, n *libnetwork.Network, ep *libnetwork.Endpoint) error {

 	if ep == nil {

 		return errors.New("invalid enppoint whhile building portmap info")

 	}

@@ -880,7 +880,7 @@ func (daemon *Daemon) ForceEndpointDelete(name string, networkName string) error

 	return ep.Delete(true)

 }

-func (daemon *Daemon) disconnectFromNetwork(container *container.Container, n libnetwork.Network, force bool) error {

+func (daemon *Daemon) disconnectFromNetwork(container *container.Container, n *libnetwork.Network, force bool) error {

 	var (

 		ep   *libnetwork.Endpoint

 		sbox *libnetwork.Sandbox

@@ -932,7 +932,7 @@ func (daemon *Daemon) disconnectFromNetwork(container *container.Container, n li

 	return nil

 }

-func (daemon *Daemon) tryDetachContainerFromClusterNetwork(network libnetwork.Network, container *container.Container) {

+func (daemon *Daemon) tryDetachContainerFromClusterNetwork(network *libnetwork.Network, container *container.Container) {

 	if daemon.clusterProvider != nil && network.Info().Dynamic() && !container.Managed {

 		if err := daemon.clusterProvider.DetachNetwork(network.Name(), container.ID); err != nil {

 			log.G(context.TODO()).Warnf("error detaching from network %s: %v", network.Name(), err)

@@ -1018,7 +1018,7 @@ func (daemon *Daemon) releaseNetwork(container *container.Container) {

 		return

 	}

-	var networks []libnetwork.Network

+	var networks []*libnetwork.Network

 	for n, epSettings := range settings {

 		if nw, err := daemon.FindNetwork(getNetworkID(n, epSettings.EndpointSettings)); err == nil {

 			networks = append(networks, nw)

@@ -323,8 +323,8 @@ func (daemon *Daemon) initNetworkController(daemonCfg *config.Config, activeSand

 		if networkTypeNorm == "private" || networkTypeNorm == "internal" {

 			continue // workaround for HNS reporting unsupported networks

 		}

-		var n libnetwork.Network

-		s := func(current libnetwork.Network) bool {

+		var n *libnetwork.Network

+		s := func(current *libnetwork.Network) bool {

 			hnsid := current.Info().DriverOptions()[winlibnetwork.HNSID]

 			if hnsid == v.Id {

 				n = current

@@ -67,12 +67,12 @@ func (daemon *Daemon) LogVolumeEvent(volumeID, action string, attributes map[str

 }

 // LogNetworkEvent generates an event related to a network with only the default attributes.

-func (daemon *Daemon) LogNetworkEvent(nw libnetwork.Network, action string) {

+func (daemon *Daemon) LogNetworkEvent(nw *libnetwork.Network, action string) {

 	daemon.LogNetworkEventWithAttributes(nw, action, map[string]string{})

 }

 // LogNetworkEventWithAttributes generates an event related to a network with specific given attributes.

-func (daemon *Daemon) LogNetworkEventWithAttributes(nw libnetwork.Network, action string, attributes map[string]string) {

+func (daemon *Daemon) LogNetworkEventWithAttributes(nw *libnetwork.Network, action string, attributes map[string]string) {

 	attributes["name"] = nw.Name()

 	attributes["type"] = nw.Type()

 	actor := events.Actor{

@@ -61,9 +61,9 @@ func (daemon *Daemon) NetworkController() *libnetwork.Controller {

 // 2. Full Name

 // 3. Partial ID

 // as long as there is no ambiguity

-func (daemon *Daemon) FindNetwork(term string) (libnetwork.Network, error) {

-	listByFullName := []libnetwork.Network{}

-	listByPartialID := []libnetwork.Network{}

+func (daemon *Daemon) FindNetwork(term string) (*libnetwork.Network, error) {

+	listByFullName := []*libnetwork.Network{}

+	listByPartialID := []*libnetwork.Network{}

 	for _, nw := range daemon.getAllNetworks() {

 		if nw.ID() == term {

 			return nw, nil

@@ -94,7 +94,7 @@ func (daemon *Daemon) FindNetwork(term string) (libnetwork.Network, error) {

 // GetNetworkByID function returns a network whose ID matches the given ID.

 // It fails with an error if no matching network is found.

-func (daemon *Daemon) GetNetworkByID(id string) (libnetwork.Network, error) {

+func (daemon *Daemon) GetNetworkByID(id string) (*libnetwork.Network, error) {

 	c := daemon.netController

 	if c == nil {

 		return nil, errors.Wrap(libnetwork.ErrNoSuchNetwork(id), "netcontroller is nil")

@@ -104,7 +104,7 @@ func (daemon *Daemon) GetNetworkByID(id string) (libnetwork.Network, error) {

 // GetNetworkByName function returns a network for a given network name.

 // If no network name is given, the default network is returned.

-func (daemon *Daemon) GetNetworkByName(name string) (libnetwork.Network, error) {

+func (daemon *Daemon) GetNetworkByName(name string) (*libnetwork.Network, error) {

 	c := daemon.netController

 	if c == nil {

 		return nil, libnetwork.ErrNoSuchNetwork(name)

@@ -116,13 +116,13 @@ func (daemon *Daemon) GetNetworkByName(name string) (libnetwork.Network, error)

 }

 // GetNetworksByIDPrefix returns a list of networks whose ID partially matches zero or more networks

-func (daemon *Daemon) GetNetworksByIDPrefix(partialID string) []libnetwork.Network {

+func (daemon *Daemon) GetNetworksByIDPrefix(partialID string) []*libnetwork.Network {

 	c := daemon.netController

 	if c == nil {

 		return nil

 	}

-	list := []libnetwork.Network{}

-	l := func(nw libnetwork.Network) bool {

+	list := []*libnetwork.Network{}

+	l := func(nw *libnetwork.Network) bool {

 		if strings.HasPrefix(nw.ID(), partialID) {

 			list = append(list, nw)

 		}

@@ -134,7 +134,7 @@ func (daemon *Daemon) GetNetworksByIDPrefix(partialID string) []libnetwork.Netwo

 }

 // getAllNetworks returns a list containing all networks

-func (daemon *Daemon) getAllNetworks() []libnetwork.Network {

+func (daemon *Daemon) getAllNetworks() []*libnetwork.Network {

 	c := daemon.netController

 	if c == nil {

 		return nil

@@ -527,7 +527,7 @@ func (daemon *Daemon) DeleteNetwork(networkID string) error {

 	return daemon.deleteNetwork(n, false)

 }

-func (daemon *Daemon) deleteNetwork(nw libnetwork.Network, dynamic bool) error {

+func (daemon *Daemon) deleteNetwork(nw *libnetwork.Network, dynamic bool) error {

 	if runconfig.IsPreDefinedNetwork(nw.Name()) && !dynamic {

 		err := fmt.Errorf("%s is a pre-defined network and cannot be removed", nw.Name())

 		return errdefs.Forbidden(err)

@@ -564,9 +564,9 @@ func (daemon *Daemon) GetNetworks(filter filters.Args, config types.NetworkListC

 	networks := daemon.getAllNetworks()

 	list := make([]types.NetworkResource, 0, len(networks))

-	var idx map[string]libnetwork.Network

+	var idx map[string]*libnetwork.Network

 	if config.Detailed {

-		idx = make(map[string]libnetwork.Network)

+		idx = make(map[string]*libnetwork.Network)

 	}

 	for _, n := range networks {

@@ -594,7 +594,7 @@ func (daemon *Daemon) GetNetworks(filter filters.Args, config types.NetworkListC

 	return list, nil

 }

-func buildNetworkResource(nw libnetwork.Network) types.NetworkResource {

+func buildNetworkResource(nw *libnetwork.Network) types.NetworkResource {

 	r := types.NetworkResource{}

 	if nw == nil {

 		return r

@@ -628,7 +628,7 @@ func buildNetworkResource(nw libnetwork.Network) types.NetworkResource {

 	return r

 }

-func buildDetailedNetworkResources(r *types.NetworkResource, nw libnetwork.Network, verbose bool) {

+func buildDetailedNetworkResources(r *types.NetworkResource, nw *libnetwork.Network, verbose bool) {

 	if nw == nil {

 		return

 	}

@@ -797,7 +797,7 @@ func (daemon *Daemon) clearAttachableNetworks() {

 }

 // buildCreateEndpointOptions builds endpoint options from a given network.

-func buildCreateEndpointOptions(c *container.Container, n libnetwork.Network, epConfig *network.EndpointSettings, sb *libnetwork.Sandbox, daemonDNS []string) ([]libnetwork.EndpointOption, error) {

+func buildCreateEndpointOptions(c *container.Container, n *libnetwork.Network, epConfig *network.EndpointSettings, sb *libnetwork.Sandbox, daemonDNS []string) ([]libnetwork.EndpointOption, error) {

 	var (

 		bindings      = make(nat.PortMap)

 		pbList        []networktypes.PortBinding

@@ -1028,7 +1028,7 @@ func getEndpointPortMapInfo(ep *libnetwork.Endpoint) (nat.PortMap, error) {

 }

 // buildEndpointInfo sets endpoint-related fields on container.NetworkSettings based on the provided network and endpoint.

-func buildEndpointInfo(networkSettings *internalnetwork.Settings, n libnetwork.Network, ep *libnetwork.Endpoint) error {

+func buildEndpointInfo(networkSettings *internalnetwork.Settings, n *libnetwork.Network, ep *libnetwork.Endpoint) error {

 	if ep == nil {

 		return errors.New("endpoint cannot be nil")

 	}

@@ -7,7 +7,7 @@ import (

 )

 // getEndpointInNetwork returns the container's endpoint to the provided network.

-func getEndpointInNetwork(name string, n libnetwork.Network) (*libnetwork.Endpoint, error) {

+func getEndpointInNetwork(name string, n *libnetwork.Network) (*libnetwork.Endpoint, error) {

 	endpointName := strings.TrimPrefix(name, "/")

 	return n.EndpointByName(endpointName)

 }

@@ -102,7 +102,7 @@ func (daemon *Daemon) localNetworksPrune(ctx context.Context, pruneFilters filte

 	until, _ := getUntilFromPruneFilters(pruneFilters)

 	// When the function returns true, the walk will stop.

-	l := func(nw libnetwork.Network) bool {

+	daemon.netController.WalkNetworks(func(nw *libnetwork.Network) bool {

 		select {

 		case <-ctx.Done():

 			// context cancelled

@@ -131,8 +131,7 @@ func (daemon *Daemon) localNetworksPrune(ctx context.Context, pruneFilters filte

 		}

 		rep.NetworksDeleted = append(rep.NetworksDeleted, nwName)

 		return false

-	}

-	daemon.netController.WalkNetworks(l)

+	})

 	return rep

 }

@@ -436,7 +436,7 @@ type epRecord struct {

 	lbIndex int

 }

-func (n *network) Services() map[string]ServiceInfo {

+func (n *Network) Services() map[string]ServiceInfo {

 	eps := make(map[string]epRecord)

 	if !n.isClusterEligible() {

@@ -519,14 +519,14 @@ func (n *network) Services() map[string]ServiceInfo {

 	return sinfo

 }

-func (n *network) isClusterEligible() bool {

+func (n *Network) isClusterEligible() bool {

 	if n.scope != datastore.SwarmScope || !n.driverIsMultihost() {

 		return false

 	}

 	return n.getController().getAgent() != nil

 }

-func (n *network) joinCluster() error {

+func (n *Network) joinCluster() error {

 	if !n.isClusterEligible() {

 		return nil

 	}

@@ -539,7 +539,7 @@ func (n *network) joinCluster() error {

 	return agent.networkDB.JoinNetwork(n.ID())

 }

-func (n *network) leaveCluster() error {

+func (n *Network) leaveCluster() error {

 	if !n.isClusterEligible() {

 		return nil

 	}

@@ -743,7 +743,7 @@ func (ep *Endpoint) deleteServiceInfoFromCluster(sb *Sandbox, fullRemove bool, m

 	return nil

 }

-func disableServiceInNetworkDB(a *agent, n *network, ep *Endpoint) {

+func disableServiceInNetworkDB(a *agent, n *Network, ep *Endpoint) {

 	var epRec EndpointRecord

 	log.G(context.TODO()).Debugf("disableServiceInNetworkDB for %s %s", ep.svcName, ep.ID())

@@ -772,7 +772,7 @@ func disableServiceInNetworkDB(a *agent, n *network, ep *Endpoint) {

 	}

 }

-func (n *network) addDriverWatches() {

+func (n *Network) addDriverWatches() {

 	if !n.isClusterEligible() {

 		return

 	}

@@ -808,7 +808,7 @@ func (n *network) addDriverWatches() {

 	}

 }

-func (n *network) cancelDriverWatches() {

+func (n *Network) cancelDriverWatches() {

 	if !n.isClusterEligible() {

 		return

 	}

@@ -839,7 +839,7 @@ func (c *Controller) handleTableEvents(ch *events.Channel, fn func(events.Event)

 	}

 }

-func (n *network) handleDriverTableEvent(ev events.Event) {

+func (n *Network) handleDriverTableEvent(ev events.Event) {

 	d, err := n.driver(false)

 	if err != nil {

 		log.G(context.TODO()).Errorf("Could not resolve driver %s while handling driver table event: %v", n.networkType, err)

@@ -76,7 +76,7 @@ import (

 // NetworkWalker is a client provided function which will be used to walk the Networks.

 // When the function returns true, the walk will stop.

-type NetworkWalker func(nw Network) bool

+type NetworkWalker func(nw *Network) bool

 // SandboxWalker is a client provided function which will be used to walk the Sandboxes.

 // When the function returns true, the walk will stop.

@@ -461,11 +461,11 @@ const overlayDSROptionString = "dsr"

 // NewNetwork creates a new network of the specified network type. The options

 // are network specific and modeled in a generic way.

-func (c *Controller) NewNetwork(networkType, name string, id string, options ...NetworkOption) (Network, error) {

+func (c *Controller) NewNetwork(networkType, name string, id string, options ...NetworkOption) (*Network, error) {

 	var (

 		caps           driverapi.Capability

 		err            error

-		t              *network

+		t              *Network

 		skipCfgEpCount bool

 	)

@@ -488,7 +488,7 @@ func (c *Controller) NewNetwork(networkType, name string, id string, options ...

 	defaultIpam := defaultIpamForNetworkType(networkType)

 	// Construct the network object

-	nw := &network{

+	nw := &Network{

 		name:             name,

 		networkType:      networkType,

 		generic:          map[string]interface{}{netlabel.GenericData: make(map[string]string)},

@@ -603,7 +603,7 @@ func (c *Controller) NewNetwork(networkType, name string, id string, options ...

 	// time pressure to get this in without adding changes to moby,

 	// swarm and CLI, it is being implemented as a driver-specific

 	// option.  Unfortunately, drivers can't influence the core

-	// "libnetwork.network" data type.  Hence we need this hack code

+	// "libnetwork.Network" data type.  Hence we need this hack code

 	// to implement in this manner.

 	if gval, ok := nw.generic[netlabel.GenericData]; ok && nw.networkType == "overlay" {

 		optMap := gval.(map[string]string)

@@ -670,15 +670,14 @@ addToStore:

 	return nw, nil

 }

-var joinCluster NetworkWalker = func(nw Network) bool {

-	n := nw.(*network)

-	if n.configOnly {

+var joinCluster NetworkWalker = func(nw *Network) bool {

+	if nw.configOnly {

 		return false

 	}

-	if err := n.joinCluster(); err != nil {

-		log.G(context.TODO()).Errorf("Failed to join network %s (%s) into agent cluster: %v", n.Name(), n.ID(), err)

+	if err := nw.joinCluster(); err != nil {

+		log.G(context.TODO()).Errorf("Failed to join network %s (%s) into agent cluster: %v", nw.Name(), nw.ID(), err)

 	}

-	n.addDriverWatches()

+	nw.addDriverWatches()

 	return false

 }

@@ -746,7 +745,7 @@ func (c *Controller) reservePools() {

 	}

 }

-func doReplayPoolReserve(n *network) bool {

+func doReplayPoolReserve(n *Network) bool {

 	_, caps, err := n.getController().getIPAMDriver(n.ipamType)

 	if err != nil {

 		log.G(context.TODO()).Warnf("Failed to retrieve ipam driver for network %q (%s): %v", n.Name(), n.ID(), err)

@@ -755,7 +754,7 @@ func doReplayPoolReserve(n *network) bool {

 	return caps.RequiresRequestReplay

 }

-func (c *Controller) addNetwork(n *network) error {

+func (c *Controller) addNetwork(n *Network) error {

 	d, err := n.driver(true)

 	if err != nil {

 		return err

@@ -772,8 +771,8 @@ func (c *Controller) addNetwork(n *network) error {

 }

 // Networks returns the list of Network(s) managed by this controller.

-func (c *Controller) Networks() []Network {

-	var list []Network

+func (c *Controller) Networks() []*Network {

+	var list []*Network

 	for _, n := range c.getNetworksFromStore() {

 		if n.inDelete {

@@ -796,21 +795,19 @@ func (c *Controller) WalkNetworks(walker NetworkWalker) {

 // NetworkByName returns the Network which has the passed name.

 // If not found, the error [ErrNoSuchNetwork] is returned.

-func (c *Controller) NetworkByName(name string) (Network, error) {

+func (c *Controller) NetworkByName(name string) (*Network, error) {

 	if name == "" {

 		return nil, ErrInvalidName(name)

 	}

-	var n Network

+	var n *Network

-	s := func(current Network) bool {

+	c.WalkNetworks(func(current *Network) bool {

 		if current.Name() == name {

 			n = current

 			return true

 		}

 		return false

-	}

-

-	c.WalkNetworks(s)

+	})

 	if n == nil {

 		return nil, ErrNoSuchNetwork(name)

@@ -821,7 +818,7 @@ func (c *Controller) NetworkByName(name string) (Network, error) {

 // NetworkByID returns the Network which has the passed id.

 // If not found, the error [ErrNoSuchNetwork] is returned.

-func (c *Controller) NetworkByID(id string) (Network, error) {

+func (c *Controller) NetworkByID(id string) (*Network, error) {

 	if id == "" {

 		return nil, ErrInvalidID(id)

 	}

@@ -162,7 +162,7 @@ func (ep *Endpoint) endpointInGWNetwork() bool {

 // Looks for the default gw network and creates it if not there.

 // Parallel executions are serialized.

-func (c *Controller) defaultGwNetwork() (Network, error) {

+func (c *Controller) defaultGwNetwork() (*Network, error) {

 	procGwNetwork <- true

 	defer func() { <-procGwNetwork }()

@@ -8,6 +8,6 @@ func getPlatformOption() EndpointOption {

 	return nil

 }

-func (c *Controller) createGWNetwork() (Network, error) {

+func (c *Controller) createGWNetwork() (*Network, error) {

 	return nil, types.NotImplementedErrorf("default gateway functionality is not implemented in freebsd")

 }

@@ -13,15 +13,13 @@ func getPlatformOption() EndpointOption {

 	return nil

 }

-func (c *Controller) createGWNetwork() (Network, error) {

-	netOption := map[string]string{

-		bridge.BridgeName:         libnGWNetwork,

-		bridge.EnableICC:          strconv.FormatBool(false),

-		bridge.EnableIPMasquerade: strconv.FormatBool(true),

-	}

-

+func (c *Controller) createGWNetwork() (*Network, error) {

 	n, err := c.NewNetwork("bridge", libnGWNetwork, "",

-		NetworkOptionDriverOpts(netOption),

+		NetworkOptionDriverOpts(map[string]string{

+			bridge.BridgeName:         libnGWNetwork,

+			bridge.EnableICC:          strconv.FormatBool(false),

+			bridge.EnableIPMasquerade: strconv.FormatBool(true),

+		}),

 		NetworkOptionEnableIPv6(false),

 	)

 	if err != nil {

@@ -16,6 +16,6 @@ func getPlatformOption() EndpointOption {

 	return EndpointOptionGeneric(epOption)

 }

-func (c *Controller) createGWNetwork() (Network, error) {

+func (c *Controller) createGWNetwork() (*Network, error) {

 	return nil, types.NotImplementedErrorf("default gateway functionality is not implemented in windows")

 }

@@ -24,7 +24,7 @@ type EndpointOption func(ep *Endpoint)

 type Endpoint struct {

 	name              string

 	id                string

-	network           *network

+	network           *Network

 	iface             *endpointInterface

 	joinInfo          *endpointJoinInfo

 	sandboxID         string

@@ -378,14 +378,14 @@ func (ep *Endpoint) processOptions(options ...EndpointOption) {

 	}

 }

-func (ep *Endpoint) getNetwork() *network {

+func (ep *Endpoint) getNetwork() *Network {

 	ep.mu.Lock()

 	defer ep.mu.Unlock()

 	return ep.network

 }

-func (ep *Endpoint) getNetworkFromStore() (*network, error) {

+func (ep *Endpoint) getNetworkFromStore() (*Network, error) {

 	if ep.network == nil {

 		return nil, fmt.Errorf("invalid network object in endpoint %s", ep.Name())

 	}

@@ -932,7 +932,7 @@ func CreateOptionIpam(ipV4, ipV6 net.IP, llIPs []net.IP, ipamOptions map[string]

 }

 // CreateOptionExposedPorts function returns an option setter for the container exposed

-// ports option to be passed to network.CreateEndpoint() method.

+// ports option to be passed to [Network.CreateEndpoint] method.

 func CreateOptionExposedPorts(exposedPorts []types.TransportPort) EndpointOption {

 	return func(ep *Endpoint) {

 		// Defensive copy

@@ -945,7 +945,7 @@ func CreateOptionExposedPorts(exposedPorts []types.TransportPort) EndpointOption

 }

 // CreateOptionPortMapping function returns an option setter for the mapping

-// ports option to be passed to network.CreateEndpoint() method.

+// ports option to be passed to [Network.CreateEndpoint] method.

 func CreateOptionPortMapping(portBindings []types.PortBinding) EndpointOption {

 	return func(ep *Endpoint) {

 		// Store a copy of the bindings as generic data to pass to the driver

@@ -9,7 +9,7 @@ import (

 )

 type endpointCnt struct {

-	n        *network

+	n        *Network

 	Count    uint64

 	dbIndex  uint64

 	dbExists bool

@@ -20,7 +20,7 @@ import (

 )

 func TestNetworkMarshalling(t *testing.T) {

-	n := &network{

+	n := &Network{

 		name:        "Miao",

 		id:          "abccba",

 		ipamType:    "default",

@@ -128,7 +128,7 @@ func TestNetworkMarshalling(t *testing.T) {

 		t.Fatal(err)

 	}

-	nn := &network{}

+	nn := &Network{}

 	err = json.Unmarshal(b, nn)

 	if err != nil {

 		t.Fatal(err)

@@ -319,7 +319,7 @@ func TestAuxAddresses(t *testing.T) {

 	}

 	defer c.Stop()

-	n := &network{ipamType: ipamapi.DefaultIPAM, networkType: "bridge", ctrlr: c}

+	n := &Network{ipamType: ipamapi.DefaultIPAM, networkType: "bridge", ctrlr: c}

 	input := []struct {

 		masterPool   string

@@ -486,12 +486,12 @@ func TestServiceVIPReuse(t *testing.T) {

 	}

 	// Add 2 services with same name but different service ID to share the same VIP

-	n.(*network).addSvcRecords("ep1", "service_test", "serviceID1", net.ParseIP("192.168.0.1"), net.IP{}, true, "test")

-	n.(*network).addSvcRecords("ep2", "service_test", "serviceID2", net.ParseIP("192.168.0.1"), net.IP{}, true, "test")

+	n.addSvcRecords("ep1", "service_test", "serviceID1", net.ParseIP("192.168.0.1"), net.IP{}, true, "test")

+	n.addSvcRecords("ep2", "service_test", "serviceID2", net.ParseIP("192.168.0.1"), net.IP{}, true, "test")

 	ipToResolve := netutils.ReverseIP("192.168.0.1")

-	ipList, _ := n.(*network).ResolveName("service_test", types.IPv4)

+	ipList, _ := n.ResolveName("service_test", types.IPv4)

 	if len(ipList) == 0 {

 		t.Fatal("There must be the VIP")

 	}

@@ -501,7 +501,7 @@ func TestServiceVIPReuse(t *testing.T) {

 	if ipList[0].String() != "192.168.0.1" {

 		t.Fatal("The service VIP is 192.168.0.1")

 	}

-	name := n.(*network).ResolveIP(ipToResolve)

+	name := n.ResolveIP(ipToResolve)

 	if name == "" {

 		t.Fatal("It must return a name")

 	}

@@ -510,8 +510,8 @@ func TestServiceVIPReuse(t *testing.T) {

 	}

 	// Delete service record for one of the services, the IP should remain because one service is still associated with it

-	n.(*network).deleteSvcRecords("ep1", "service_test", "serviceID1", net.ParseIP("192.168.0.1"), net.IP{}, true, "test")

-	ipList, _ = n.(*network).ResolveName("service_test", types.IPv4)

+	n.deleteSvcRecords("ep1", "service_test", "serviceID1", net.ParseIP("192.168.0.1"), net.IP{}, true, "test")

+	ipList, _ = n.ResolveName("service_test", types.IPv4)

 	if len(ipList) == 0 {

 		t.Fatal("There must be the VIP")

 	}

@@ -521,7 +521,7 @@ func TestServiceVIPReuse(t *testing.T) {

 	if ipList[0].String() != "192.168.0.1" {

 		t.Fatal("The service VIP is 192.168.0.1")

 	}

-	name = n.(*network).ResolveIP(ipToResolve)

+	name = n.ResolveIP(ipToResolve)

 	if name == "" {

 		t.Fatal("It must return a name")

 	}

@@ -530,8 +530,8 @@ func TestServiceVIPReuse(t *testing.T) {

 	}

 	// Delete again the service using the previous service ID, nothing should happen

-	n.(*network).deleteSvcRecords("ep2", "service_test", "serviceID1", net.ParseIP("192.168.0.1"), net.IP{}, true, "test")

-	ipList, _ = n.(*network).ResolveName("service_test", types.IPv4)

+	n.deleteSvcRecords("ep2", "service_test", "serviceID1", net.ParseIP("192.168.0.1"), net.IP{}, true, "test")

+	ipList, _ = n.ResolveName("service_test", types.IPv4)

 	if len(ipList) == 0 {

 		t.Fatal("There must be the VIP")

 	}

@@ -541,7 +541,7 @@ func TestServiceVIPReuse(t *testing.T) {

 	if ipList[0].String() != "192.168.0.1" {

 		t.Fatal("The service VIP is 192.168.0.1")

 	}

-	name = n.(*network).ResolveIP(ipToResolve)

+	name = n.ResolveIP(ipToResolve)

 	if name == "" {

 		t.Fatal("It must return a name")

 	}

@@ -550,12 +550,12 @@ func TestServiceVIPReuse(t *testing.T) {

 	}

 	// Delete now using the second service ID, now all the entries should be gone

-	n.(*network).deleteSvcRecords("ep2", "service_test", "serviceID2", net.ParseIP("192.168.0.1"), net.IP{}, true, "test")

-	ipList, _ = n.(*network).ResolveName("service_test", types.IPv4)

+	n.deleteSvcRecords("ep2", "service_test", "serviceID2", net.ParseIP("192.168.0.1"), net.IP{}, true, "test")

+	ipList, _ = n.ResolveName("service_test", types.IPv4)

 	if len(ipList) != 0 {

 		t.Fatal("All the VIPs should be gone now")

 	}

-	name = n.(*network).ResolveIP(ipToResolve)

+	name = n.ResolveIP(ipToResolve)

 	if name != "" {

 		t.Fatalf("It must return empty no more services associated, instead:%s", name)

 	}

@@ -31,7 +31,7 @@ const (

 	bridgeNetType = "bridge"

 )

-func makeTesthostNetwork(t *testing.T, c *libnetwork.Controller) libnetwork.Network {

+func makeTesthostNetwork(t *testing.T, c *libnetwork.Controller) *libnetwork.Network {

 	t.Helper()

 	n, err := createTestNetwork(c, "host", "testhost", options.Generic{}, nil, nil)

 	if err != nil {

@@ -847,7 +847,7 @@ func TestResolvConf(t *testing.T) {

 type parallelTester struct {

 	osctx      *testutils.OSContext

 	controller *libnetwork.Controller

-	net1, net2 libnetwork.Network

+	net1, net2 *libnetwork.Network

 	iterCnt    int

 }

@@ -47,7 +47,7 @@ func newController(t *testing.T) *libnetwork.Controller {

 	return c

 }

-func createTestNetwork(c *libnetwork.Controller, networkType, networkName string, netOption options.Generic, ipamV4Configs, ipamV6Configs []*libnetwork.IpamConf) (libnetwork.Network, error) {

+func createTestNetwork(c *libnetwork.Controller, networkType, networkName string, netOption options.Generic, ipamV4Configs, ipamV6Configs []*libnetwork.IpamConf) (*libnetwork.Network, error) {

 	return c.NewNetwork(networkType, networkName, "",

 		libnetwork.NetworkOptionGeneric(netOption),

 		libnetwork.NetworkOptionIpam(ipamapi.DefaultIPAM, "", ipamV4Configs, ipamV6Configs, nil))

@@ -549,8 +549,8 @@ func TestNetworkEndpointsWalkers(t *testing.T) {

 	// Test Network Walk method

 	var netName string

-	var netWanted libnetwork.Network

-	nwWlk := func(nw libnetwork.Network) bool {

+	var netWanted *libnetwork.Network

+	nwWlk := func(nw *libnetwork.Network) bool {

 		if nw.Name() == netName {

 			netWanted = nw

 			return true

@@ -24,41 +24,6 @@ import (

 	"github.com/docker/docker/pkg/stringid"

 )

-// A Network represents a logical connectivity zone that containers may

-// join using the Link method. A Network is managed by a specific driver.

-type Network interface {

-	// Name returns a user chosen name for this network.

-	Name() string

-

-	// ID returns a system generated id for this network.

-	ID() string

-

-	// Type returns the type of network, which corresponds to its managing driver.

-	Type() string

-

-	// CreateEndpoint creates a new endpoint to this network symbolically identified by the

-	// specified unique name. The options parameter carries driver specific options.

-	CreateEndpoint(name string, options ...EndpointOption) (*Endpoint, error)

-

-	// Delete the network.

-	Delete(options ...NetworkDeleteOption) error

-

-	// Endpoints returns the list of Endpoint(s) in this network.

-	Endpoints() []*Endpoint

-

-	// WalkEndpoints uses the provided function to walk the Endpoints.

-	WalkEndpoints(walker EndpointWalker)

-

-	// EndpointByName returns the Endpoint which has the passed name. If not found, the error ErrNoSuchEndpoint is returned.

-	EndpointByName(name string) (*Endpoint, error)

-

-	// EndpointByID returns the Endpoint which has the passed id. If not found, the error ErrNoSuchEndpoint is returned.

-	EndpointByID(id string) (*Endpoint, error)

-

-	// Info returns certain operational data belonging to this network.

-	Info() NetworkInfo

-}

-

 // NetworkInfo returns some configuration and operational information about the network

 type NetworkInfo interface {

 	IpamConfig() (string, map[string]string, []*IpamConf, []*IpamConf)

@@ -199,7 +164,9 @@ func (i *IpamInfo) UnmarshalJSON(data []byte) error {

 	return nil

 }

-type network struct {

+// Network represents a logical connectivity zone that containers may

+// join using the Link method. A network is managed by a specific driver.

+type Network struct {

 	ctrlr            *Controller

 	name             string

 	networkType      string

@@ -243,45 +210,48 @@ const (

 	loadBalancerModeDefault = loadBalancerModeNAT

 )

-func (n *network) Name() string {

+// Name returns a user chosen name for this network.

+func (n *Network) Name() string {

 	n.mu.Lock()

 	defer n.mu.Unlock()

 	return n.name

 }

-func (n *network) ID() string {

+// ID returns a system generated id for this network.

+func (n *Network) ID() string {

 	n.mu.Lock()

 	defer n.mu.Unlock()

 	return n.id

 }

-func (n *network) Created() time.Time {

+func (n *Network) Created() time.Time {

 	n.mu.Lock()

 	defer n.mu.Unlock()

 	return n.created

 }

-func (n *network) Type() string {

+// Type returns the type of network, which corresponds to its managing driver.

+func (n *Network) Type() string {

 	n.mu.Lock()

 	defer n.mu.Unlock()

 	return n.networkType

 }

-func (n *network) Key() []string {

+func (n *Network) Key() []string {

 	n.mu.Lock()

 	defer n.mu.Unlock()

 	return []string{datastore.NetworkKeyPrefix, n.id}

 }

-func (n *network) KeyPrefix() []string {

+func (n *Network) KeyPrefix() []string {

 	return []string{datastore.NetworkKeyPrefix}

 }

-func (n *network) Value() []byte {

+func (n *Network) Value() []byte {

 	n.mu.Lock()

 	defer n.mu.Unlock()

 	b, err := json.Marshal(n)

@@ -291,40 +261,40 @@ func (n *network) Value() []byte {

 	return b

 }

-func (n *network) SetValue(value []byte) error {

+func (n *Network) SetValue(value []byte) error {

 	return json.Unmarshal(value, n)

 }

-func (n *network) Index() uint64 {

+func (n *Network) Index() uint64 {

 	n.mu.Lock()

 	defer n.mu.Unlock()

 	return n.dbIndex

 }

-func (n *network) SetIndex(index uint64) {

+func (n *Network) SetIndex(index uint64) {

 	n.mu.Lock()

 	n.dbIndex = index

 	n.dbExists = true

 	n.mu.Unlock()

 }

-func (n *network) Exists() bool {