diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-19 13:57:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-19 13:57:13 +0100 |
| commit | 5432bb95f1a0b818a81565cd46c3f1cef1904e30 (patch) | |
| tree | 412e3b0f2ff33446d0227715c51165e4517a3308 /libpod/networking_linux.go | |
| parent | c603318b43187bd5e1642246d84da2bcd5c68aae (diff) | |
| parent | 2e5d3e8fb34ba3ab42d53da9ba39b71e1f53bb75 (diff) | |
| download | podman-5432bb95f1a0b818a81565cd46c3f1cef1904e30.tar.gz podman-5432bb95f1a0b818a81565cd46c3f1cef1904e30.tar.bz2 podman-5432bb95f1a0b818a81565cd46c3f1cef1904e30.zip | |
Merge pull request #12174 from fgimenez/fix-docker-networksettings-type-discrepancy
Introduces Address type to be used in secondary IPv4 and IPv6 inspect data structure
Diffstat (limited to 'libpod/networking_linux.go')
| -rw-r--r-- | libpod/networking_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 314a74427..7d1214183 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -1139,7 +1139,7 @@ func resultToBasicNetworkConfig(result types.StatusBlock) (define.InspectBasicNe config.IPPrefixLen = size config.Gateway = netAddress.Gateway.String() } else { - config.SecondaryIPAddresses = append(config.SecondaryIPAddresses, netAddress.IPNet.IP.String()) + config.SecondaryIPAddresses = append(config.SecondaryIPAddresses, define.Address{Addr: netAddress.IPNet.IP.String(), PrefixLength: size}) } } else { //ipv6 @@ -1148,7 +1148,7 @@ func resultToBasicNetworkConfig(result types.StatusBlock) (define.InspectBasicNe config.GlobalIPv6PrefixLen = size config.IPv6Gateway = netAddress.Gateway.String() } else { - config.SecondaryIPv6Addresses = append(config.SecondaryIPv6Addresses, netAddress.IPNet.IP.String()) + config.SecondaryIPv6Addresses = append(config.SecondaryIPv6Addresses, define.Address{Addr: netAddress.IPNet.IP.String(), PrefixLength: size}) } } } |