containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2258 from Luap99/pasta-link-local 

libnetwork/pasta: do not ignore ipv4 link local
This commit is contained in:
openshift-merge-bot[bot] 2024-12-04 15:37:39 +00:00 committed by GitHub
parent 536f739c95 4fae670ff5
commit 7e20cb769e
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/libnetwork/pasta/pasta_linux.go
View File

@ -110,13 +110,26 @@ func Setup(opts *SetupOptions) (*SetupResult, error) {
return err return err
} }
for _, addr := range addrs { for _, addr := range addrs {
// make sure to skip localhost and other special addresses // make sure to skip loopback and multicast addresses
if ipnet, ok := addr.(*net.IPNet); ok && ipnet.IP.IsGlobalUnicast() { if ipnet, ok := addr.(*net.IPNet); ok && !ipnet.IP.IsLoopback() && !ipnet.IP.IsMulticast() {
result.IPAddresses = append(result.IPAddresses, ipnet.IP) if util.IsIPv4(ipnet.IP) {
if !ipv4 && util.IsIPv4(ipnet.IP) { result.IPAddresses = append(result.IPAddresses, ipnet.IP)
ipv4 = true ipv4 = true
} } else if !ipnet.IP.IsLinkLocalUnicast() {
if !ipv6 && util.IsIPv6(ipnet.IP) { // Else must be ipv6.
// We shouldn't resolve hosts.containers.internal to IPv6
// link-local addresses, for two reasons:
// 1. even if IPv6 is disabled in pasta (--ipv4-only), the
// kernel will configure an IPv6 link-local address in the
// container, but that doesn't mean that IPv6 connectivity
// is actually working
// 2. link-local addresses need to be suffixed by the zone
// (interface) to be of any use, but we can't do it here
//
// Thus, don't include IPv6 link-local addresses in
// IPAddresses: Podman uses them for /etc/hosts entries, and
// those need to be functional.
result.IPAddresses = append(result.IPAddresses, ipnet.IP)
ipv6 = true ipv6 = true
} }
} }