diff options
author | Doug Rabson <dfr@rabson.org> | 2022-09-07 17:17:21 +0100 |
---|---|---|
committer | Doug Rabson <dfr@rabson.org> | 2022-09-12 16:28:47 +0100 |
commit | f939f3fdfccaeeb976085e5082e56efe6eb6df62 (patch) | |
tree | b8701d6fc00fcc5ab89c40812fe3974db70c9b1b /libpod/networking_freebsd.go | |
parent | c9de84080dd9570944dd4b7b0e46160bb83998bb (diff) | |
download | podman-f939f3fdfccaeeb976085e5082e56efe6eb6df62.tar.gz podman-f939f3fdfccaeeb976085e5082e56efe6eb6df62.tar.bz2 podman-f939f3fdfccaeeb976085e5082e56efe6eb6df62.zip |
libpod: Move resultToBasicNetworkConfig to networking_common.go
[NO NEW TESTS NEEDED]
Signed-off-by: Doug Rabson <dfr@rabson.org>
Diffstat (limited to 'libpod/networking_freebsd.go')
-rw-r--r-- | libpod/networking_freebsd.go | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/libpod/networking_freebsd.go b/libpod/networking_freebsd.go index 00666064b..b6bcb3f71 100644 --- a/libpod/networking_freebsd.go +++ b/libpod/networking_freebsd.go @@ -260,49 +260,7 @@ func (c *Container) joinedNetworkNSPath() string { func (c *Container) inspectJoinedNetworkNS(networkns string) (q types.StatusBlock, retErr error) { // TODO: extract interface information from the vnet jail return types.StatusBlock{}, nil -} -// resultToBasicNetworkConfig produces an InspectBasicNetworkConfig from a CNI -// result -func resultToBasicNetworkConfig(result types.StatusBlock) define.InspectBasicNetworkConfig { - config := define.InspectBasicNetworkConfig{} - interfaceNames := make([]string, 0, len(result.Interfaces)) - for interfaceName := range result.Interfaces { - interfaceNames = append(interfaceNames, interfaceName) - } - // ensure consistent inspect results by sorting - sort.Strings(interfaceNames) - for _, interfaceName := range interfaceNames { - netInt := result.Interfaces[interfaceName] - for _, netAddress := range netInt.Subnets { - size, _ := netAddress.IPNet.Mask.Size() - if netAddress.IPNet.IP.To4() != nil { - // ipv4 - if config.IPAddress == "" { - config.IPAddress = netAddress.IPNet.IP.String() - config.IPPrefixLen = size - config.Gateway = netAddress.Gateway.String() - } else { - config.SecondaryIPAddresses = append(config.SecondaryIPAddresses, define.Address{Addr: netAddress.IPNet.IP.String(), PrefixLength: size}) - } - } else { - // ipv6 - if config.GlobalIPv6Address == "" { - config.GlobalIPv6Address = netAddress.IPNet.IP.String() - config.GlobalIPv6PrefixLen = size - config.IPv6Gateway = netAddress.Gateway.String() - } else { - config.SecondaryIPv6Addresses = append(config.SecondaryIPv6Addresses, define.Address{Addr: netAddress.IPNet.IP.String(), PrefixLength: size}) - } - } - } - if config.MacAddress == "" { - config.MacAddress = netInt.MacAddress.String() - } else { - config.AdditionalMacAddresses = append(config.AdditionalMacAddresses, netInt.MacAddress.String()) - } - } - return config } // NetworkDisconnect removes a container from the network |