diff --git a/rosenpass/src/cli.rs b/rosenpass/src/cli.rs index 082e4124..3fa058ff 100644 --- a/rosenpass/src/cli.rs +++ b/rosenpass/src/cli.rs @@ -30,7 +30,6 @@ use { rosenpass_wireguard_broker::WireguardBrokerMio, rosenpass_wireguard_broker::brokers::mio_client::MioBrokerClient, rustix::net::{AddressFamily, SocketFlags, SocketType, socketpair}, - std::os::fd::AsRawFd, std::os::unix::net, std::process::Command, std::thread, @@ -583,7 +582,7 @@ impl CliArgs { let mut child = Command::new("rosenpass-wireguard-broker-socket-handler") .args(["--stream-fd", "3"]) .fd_mappings(vec![FdMapping { - parent_fd: theirs.as_raw_fd(), + parent_fd: theirs, child_fd: 3, }])? .spawn()?; diff --git a/rosenpass/tests/api-integration-tests-api-setup.rs b/rosenpass/tests/api-integration-tests-api-setup.rs index eaa5b398..e9fd7530 100644 --- a/rosenpass/tests/api-integration-tests-api-setup.rs +++ b/rosenpass/tests/api-integration-tests-api-setup.rs @@ -156,7 +156,7 @@ fn api_integration_api_setup(protocol_version: ProtocolVersion) -> anyhow::Resul std::process::Command::new(env!("CARGO_BIN_EXE_rosenpass")) .args(["--api-stream-fd", &deliberate_fail_child_fd.to_string()]) .fd_mappings(vec![FdMapping { - parent_fd: deliberate_fail_api_server.move_here().as_raw_fd(), + parent_fd: deliberate_fail_api_server.move_here().into(), child_fd: 3, }])? .args([