feat: Enable ipv6 and add address family sorting option

Author: rustybee42

mgmtd/assets/beegfs-mgmtd.toml

@@ -41,6 +41,11 @@
 # The interfaces are reported in the given order. If not given, all suitable interfaces can be used.
 # interfaces = ["eth0", "eth1"]
 
+# Prefers an interfaces ipv6 addresses over ipv4.
+# By default, ipv4 addresses are preferred. If the interface filter is given, the interface
+# order has higher priority than the address family, which is sorted per interface.
+# interfaces_prefer_ipv6 = false
+
 # Maximum number of outgoing connections per node.
 # connection-limit = 12
 

mgmtd/src/config.rs

@@ -212,6 +212,14 @@ generate_structs! {
     #[arg(value_delimiter = ',')]
     interfaces: Vec<String> = vec![],
 
+    /// Prefers an interfaces ipv6 addresses over ipv4.
+    ///
+    /// By default, ipv4 addresses are preferred. If the interface filter is given, the interface
+    /// order has higher priority than the address family, which is sorted per interface.
+    #[arg(long)]
+    #[arg(num_args = 0..=1, default_missing_value = "true")]
+    interfaces_prefer_ipv6: bool = false,
+
     /// Maximum number of outgoing BeeMsg connections per node. [default: 12]
     #[arg(long)]
     #[arg(value_name = "LIMIT")]

mgmtd/src/lib.rs

@@ -63,7 +63,7 @@ pub async fn start(info: StaticInfo, license: LicenseVerifier) -> Result<RunCont
     // UDP socket for in- and outgoing messages
     let udp_socket = Arc::new(
         UdpSocket::bind(SocketAddr::new(
-            "0.0.0.0".parse()?,
+            "::0".parse()?,
             info.user_config.beemsg_port,
         ))
         .await?,
@@ -122,7 +122,7 @@ pub async fn start(info: StaticInfo, license: LicenseVerifier) -> Result<RunCont
 
     // Listen for incoming TCP connections
     incoming::listen_tcp(
-        SocketAddr::new("0.0.0.0".parse()?, ctx.info.user_config.beemsg_port),
+        SocketAddr::new("::0".parse()?, ctx.info.user_config.beemsg_port),
         ctx.clone(),
         info.auth_secret.is_some(),
         run_state.clone(),

mgmtd/src/main.rs

@@ -97,7 +97,8 @@ doc.beegfs.io.",
         None
     };
 
-    let network_addrs = shared::ethernet_interfaces(&user_config.interfaces)?;
+    let network_addrs =
+        shared::ethernet_interfaces(&user_config.interfaces, user_config.interfaces_prefer_ipv6)?;
 
     // Configure the tokio runtime
     let rt = tokio::runtime::Builder::new_multi_thread()

shared/src/lib.rs

@@ -30,19 +30,17 @@ pub struct NetworkAddr {
 ///
 /// Only interfaces matching one of the given names in `filter` will be returned, unless the list
 /// is empty.
-pub fn ethernet_interfaces(filter: &[impl AsRef<str>]) -> Result<Vec<NetworkAddr>> {
+pub fn ethernet_interfaces(
+    filter: &[impl AsRef<str>],
+    prefer_ipv6: bool,
+) -> Result<Vec<NetworkAddr>> {
     let mut filtered_nics = vec![];
     for interface in pnet_datalink::interfaces() {
         if !filter.is_empty() && !filter.iter().any(|e| interface.name == e.as_ref()) {
             continue;
         }
 
         for ip in interface.ips {
-            // TODO Ipv6: Remove the Ipv4 filter when protocol changes (https://github.com/ThinkParQ/beegfs-rs/issues/145)
-            if !ip.is_ipv4() {
-                continue;
-            }
-
             filtered_nics.push(NetworkAddr {
                 addr: ip.ip(),
                 name: interface.name.clone(),
@@ -58,8 +56,11 @@ pub fn ethernet_interfaces(filter: &[impl AsRef<str>]) -> Result<Vec<NetworkAddr
         bail!("At least one network interface doesn't exist");
     }
 
+    // Sort by address family
+    filtered_nics.sort_unstable_by_key(|k| (prefer_ipv6 ^ k.addr.is_ipv6()) as usize);
+
     // Sort
-    filtered_nics.sort_unstable_by_key(|k| {
+    filtered_nics.sort_by_key(|k| {
         if filter.is_empty() {
             // Move loopbacks to the back
             k.addr.is_loopback() as usize