diff --git a/run_tests.sh b/run_tests.sh index ffea5e22..816aab60 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -123,7 +123,7 @@ do configure_ne_driver - timeout 5m \ + timeout 7m \ ./build/nitro_cli/"${ARCH}"-unknown-linux-musl/release/deps/"${test_exec_name}" \ --test-threads=1 --nocapture || test_failed done < <(grep -v '^ *#' < build/test_executables.txt) diff --git a/samples/command_executer/Cargo.toml b/samples/command_executer/Cargo.toml index d8b01ed7..b57c7295 100644 --- a/samples/command_executer/Cargo.toml +++ b/samples/command_executer/Cargo.toml @@ -10,7 +10,7 @@ rust-version = "1.60" [dependencies] clap = "3.2" log = "0.4" -nix = "0.23" +nix = "0.26" serde = { version = ">=1.0", features = ["derive"] } serde_json = "1.0" byteorder = "1.3" diff --git a/samples/command_executer/src/lib.rs b/samples/command_executer/src/lib.rs index 92791b27..1c9e7963 100644 --- a/samples/command_executer/src/lib.rs +++ b/samples/command_executer/src/lib.rs @@ -7,7 +7,7 @@ use protocol_helpers::{recv_loop, recv_u64, send_loop, send_u64}; use nix::sys::socket::listen as listen_vsock; use nix::sys::socket::{accept, bind, connect, shutdown, socket}; -use nix::sys::socket::{AddressFamily, Shutdown, SockAddr, SockFlag, SockType}; +use nix::sys::socket::{AddressFamily, Shutdown, VsockAddr, SockFlag, SockType}; use nix::unistd::close; use num_derive::FromPrimitive; use num_traits::FromPrimitive; @@ -56,7 +56,7 @@ impl AsRawFd for VsockSocket { } fn vsock_connect(cid: u32, port: u32) -> Result { - let sockaddr = SockAddr::new_vsock(cid, port); + let sockaddr = VsockAddr::new(cid, port); let mut err_msg = String::new(); for i in 0..MAX_CONNECTION_ATTEMPTS { @@ -197,7 +197,7 @@ pub fn listen(args: ListenArgs) -> Result<(), String> { ) .map_err(|err| format!("Create socket failed: {:?}", err))?; - let sockaddr = SockAddr::new_vsock(VMADDR_CID_ANY, args.port); + let sockaddr = VsockAddr::new(VMADDR_CID_ANY, args.port); bind(socket_fd, &sockaddr).map_err(|err| format!("Bind failed: {:?}", err))?;