diff --git a/Cargo.lock b/Cargo.lock index 7c0c32e..7a862ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,18 +1,18 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "autocfg" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "byteorder" @@ -26,6 +26,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "keepassxc-proxy" version = "0.2.0" @@ -47,15 +53,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.126" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -72,12 +78,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags", "cfg-if", + "cfg_aliases", "libc", "memoffset", ] diff --git a/Cargo.toml b/Cargo.toml index bebd2c1..025dbe7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ repository = "https://github.com/varjolintu/keepassxc-proxy-rust" [dependencies] byteorder = "1.1.0" -nix = "0.24.0" +nix = { version = "0.29.0", features = ["socket"] } [target.'cfg(windows)'.dependencies] named_pipe = "0.2" diff --git a/src/proxy_socket.rs b/src/proxy_socket.rs index 2214ec8..342e526 100644 --- a/src/proxy_socket.rs +++ b/src/proxy_socket.rs @@ -7,7 +7,7 @@ use { setsockopt, sockopt::{RcvBuf, SndBuf}, }, - std::os::unix::{io::AsRawFd, net::UnixStream}, + std::os::unix::net::UnixStream, std::path::PathBuf, }; @@ -96,8 +96,8 @@ pub fn connect(buffer_size: usize) -> io::Result> { .find_map(|dir| UnixStream::connect(dir.join(socket_name)).ok()) .ok_or_else(|| io::Error::from(io::ErrorKind::NotFound))?; - setsockopt(s.as_raw_fd(), SndBuf, &buffer_size)?; - setsockopt(s.as_raw_fd(), RcvBuf, &buffer_size)?; + setsockopt(&s, SndBuf, &buffer_size)?; + setsockopt(&s, RcvBuf, &buffer_size)?; // Make sure reads are blocking. s.set_nonblocking(false)?;