f3

Author: rustybee42

mgmtd/src/grpc.rs

@@ -212,10 +212,16 @@ pub(crate) fn serve(ctx: Context, mut shutdown: RunStateHandle) -> Result<()> {
 
     let mut serve_addr = SocketAddr::new("::".parse()?, ctx.info.user_config.grpc_port);
 
-    // Test for IPv6 available
-    if TcpListener::bind(serve_addr).is_err() {
-        log::debug!("gRPC: IPv6 not available, falling back to IPv4 sockets");
-        serve_addr = SocketAddr::new("0.0.0.0".parse()?, ctx.info.user_config.grpc_port);
+    // Test for IPv6 available, fall back to IPv4 sockets if not
+    match TcpListener::bind(serve_addr) {
+        Ok(_) => {}
+        Err(err) if err.raw_os_error() == Some(libc::EAFNOSUPPORT) => {
+            log::debug!(": IPv6 not available, falling back to IPv4 sockets");
+            serve_addr = SocketAddr::new("0.0.0.0".parse()?, ctx.info.user_config.grpc_port);
+        }
+        Err(err) => {
+            anyhow::bail!(err);
+        }
     }
 
     log::info!("Serving gRPC requests on {serve_addr}");

mgmtd/src/lib.rs

@@ -27,7 +27,6 @@ use sqlite::TransactionExt;
 use sqlite_check::sql;
 use std::collections::HashSet;
 use std::future::Future;
-use std::io::ErrorKind;
 use std::net::{SocketAddr, TcpListener};
 use std::sync::Arc;
 use tokio::net::UdpSocket;
@@ -66,12 +65,11 @@ pub async fn start(info: StaticInfo, license: LicenseVerifier) -> Result<RunCont
     // Test for IPv6 available, fall back to IPv4 sockets if not
     match TcpListener::bind(beemsg_serve_addr) {
         Ok(_) => {}
-        Err(err) if err.kind() == ErrorKind::Unsupported => {
+        Err(err) if err.raw_os_error() == Some(libc::EAFNOSUPPORT) => {
             log::debug!("BeeMsg: IPv6 not available, falling back to IPv4 sockets");
             beemsg_serve_addr = SocketAddr::new("0.0.0.0".parse()?, info.user_config.beemsg_port);
         }
         Err(err) => {
-            log::error!("{:?}", err.kind());
             anyhow::bail!(err);
         }
     }