github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-05 19:47:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11227 from fidencio/topic/agent-only-try-ipv6-if-stack-is-supported

Browse Source 
agent: netlink: Only add an ipv6 address if ipv6 is enabled
This commit is contained in:
Fabiano Fidêncio 2025-05-02 12:31:40 +02:00 committed by GitHub
commit fbf7faa9f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/agent/src/netlink.rs
View File

@ -20,6 +20,7 @@ use protocols::types::{ARPNeighbor, IPAddress, IPFamily, Interface, Route};
use rtnetlink::{new_connection, IpVersion}; use rtnetlink::{new_connection, IpVersion};
use std::convert::{TryFrom, TryInto}; use std::convert::{TryFrom, TryInto};
use std::fmt; use std::fmt;
use std::fs;
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr}; use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
use std::ops::Deref; use std::ops::Deref;
use std::str::{self, FromStr}; use std::str::{self, FromStr};
@ -113,12 +114,30 @@ impl Handle {
self.enable_link(link.index(), false).await?; self.enable_link(link.index(), false).await?;
} }
// Get whether the network stack has ipv6 enabled or disabled.
let supports_ipv6_all = fs::read_to_string("/proc/sys/net/ipv6/conf/all/disable_ipv6")
.map(|s| s.trim() == "0")
.unwrap_or(false);
let supports_ipv6_default =
fs::read_to_string("/proc/sys/net/ipv6/conf/default/disable_ipv6")
.map(|s| s.trim() == "0")
.unwrap_or(false);
let supports_ipv6 = supports_ipv6_default || supports_ipv6_all;
// Add new ip addresses from request // Add new ip addresses from request
for ip_address in &iface.IPAddresses { for ip_address in &iface.IPAddresses {
let ip = IpAddr::from_str(ip_address.address())?; let ip = IpAddr::from_str(ip_address.address())?;
let mask = ip_address.mask().parse::<u8>()?; let mask = ip_address.mask().parse::<u8>()?;
self.add_addresses(link.index(), std::iter::once(IpNetwork::new(ip, mask)?)) let net = IpNetwork::new(ip, mask)?;
if !net.is_ipv4() && !supports_ipv6 {
// If we're dealing with an ipv6 address, but the stack does not
// support ipv6, skip adding it otherwise it will lead to an
// error at the "CreatePodSandbox" time.
continue;
}
self.add_addresses(link.index(), std::iter::once(net))
.await?; .await?;
} }