gitea-mirror/rosenpass
1
0
Fork 0
mirror of https://github.com/rosenpass/rosenpass.git synced 2026-06-12 11:01:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix regressions from upgrading command-fds

Browse Source
This commit is contained in:
Ilka Schulz
2026-06-08 17:33:53 +02:00
parent fd82409870
commit 831286a717
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rosenpass/src/cli.rs
+1 -2
View File
@@ -30,7 +30,6 @@ use {
rosenpass_wireguard_broker::WireguardBrokerMio, rosenpass_wireguard_broker::WireguardBrokerMio,
rosenpass_wireguard_broker::brokers::mio_client::MioBrokerClient, rosenpass_wireguard_broker::brokers::mio_client::MioBrokerClient,
rustix::net::{AddressFamily, SocketFlags, SocketType, socketpair}, rustix::net::{AddressFamily, SocketFlags, SocketType, socketpair},
std::os::fd::AsRawFd,
std::os::unix::net, std::os::unix::net,
std::process::Command, std::process::Command,
std::thread, std::thread,
@@ -583,7 +582,7 @@ impl CliArgs {
let mut child = Command::new("rosenpass-wireguard-broker-socket-handler") let mut child = Command::new("rosenpass-wireguard-broker-socket-handler")
.args(["--stream-fd", "3"]) .args(["--stream-fd", "3"])
.fd_mappings(vec![FdMapping { .fd_mappings(vec![FdMapping {
parent_fd: theirs.as_raw_fd(), parent_fd: theirs,
child_fd: 3, child_fd: 3,
}])? }])?
.spawn()?; .spawn()?;
rosenpass/tests/api-integration-tests-api-setup.rs
+1 -1
View File
@@ -156,7 +156,7 @@ fn api_integration_api_setup(protocol_version: ProtocolVersion) -> anyhow::Resul
std::process::Command::new(env!("CARGO_BIN_EXE_rosenpass")) std::process::Command::new(env!("CARGO_BIN_EXE_rosenpass"))
.args(["--api-stream-fd", &deliberate_fail_child_fd.to_string()]) .args(["--api-stream-fd", &deliberate_fail_child_fd.to_string()])
.fd_mappings(vec![FdMapping { .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, child_fd: 3,
}])? }])?
.args([ .args([