Skip to content

Remove unix_socket dependency #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 25, 2024
Merged

Remove unix_socket dependency #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b1bc28
Remove unix_socket dependency
epilys Dec 24, 2024
5e6ce3f
varlink: remove unnecessary allocation
epilys Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion varlink/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ winapi = { version = "0.3", features = ["winuser", "winsock2"] }

[target.'cfg(unix)'.dependencies]
libc = { version = "0.2.126", default-features = false }
unix_socket = "0.5"

[dev-dependencies]
static_assertions = "1.1.0"
30 changes: 9 additions & 21 deletions varlink/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::net::TcpStream;
#[cfg(unix)]
use std::os::unix::io::{AsRawFd, IntoRawFd};
#[cfg(unix)]
use std::os::unix::net::UnixStream;
use std::os::unix::net::{UnixListener, UnixStream};
use std::process::Child;

#[cfg(unix)]
Expand All @@ -28,13 +28,11 @@ pub fn varlink_connect<S: ?Sized + AsRef<str>>(address: &S) -> Result<(Box<dyn S
Box::new(TcpStream::connect(addr).map_err(map_context!())?),
new_address,
))
} else if let Some(addr) = new_address.strip_prefix("unix:@") {
let addr = addr.split(';').next().unwrap_or(addr);
get_abstract_unixstream(addr).map(|v| (Box::new(v) as Box<dyn Stream>, new_address))
} else if let Some(addr) = new_address.strip_prefix("unix:") {
let mut addr = String::from(addr.split(';').next().unwrap());
if addr.starts_with('@') {
addr = addr.replacen('@', "\0", 1);
return get_abstract_unixstream(&addr)
.map(|v| (Box::new(v) as Box<dyn Stream>, new_address));
}
let addr = addr.split(';').next().unwrap_or(addr);
Ok((
Box::new(UnixStream::connect(addr).map_err(map_context!())?),
new_address,
Expand All @@ -46,18 +44,11 @@ pub fn varlink_connect<S: ?Sized + AsRef<str>>(address: &S) -> Result<(Box<dyn S

#[cfg(any(target_os = "linux", target_os = "android"))]
fn get_abstract_unixstream(addr: &str) -> Result<UnixStream> {
// FIXME: abstract unix domains sockets still not in std
// FIXME: https://github.com/rust-lang/rust/issues/14194
use std::os::unix::io::FromRawFd;
use unix_socket::UnixStream as AbstractStream;
use std::os::linux::net::SocketAddrExt;
use std::os::unix::net::SocketAddr;

unsafe {
Ok(UnixStream::from_raw_fd(
AbstractStream::connect(addr)
.map_err(map_context!())?
.into_raw_fd(),
))
}
let addr = SocketAddr::from_abstract_name(addr).map_err(map_context!())?;
UnixStream::connect_addr(&addr).map_err(map_context!())
}

#[cfg(not(any(target_os = "linux", target_os = "android")))]
Expand Down Expand Up @@ -85,8 +76,6 @@ pub fn varlink_exec<S: ?Sized + AsRef<str>>(

let executable = String::from("exec ") + address.as_ref();

use unix_socket::UnixListener;

let dir = tempdir().map_err(map_context!())?;
let file_path = dir.path().join("varlink-socket");

Expand Down Expand Up @@ -153,7 +142,6 @@ pub fn varlink_bridge<S: ?Sized + AsRef<str>>(address: &S) -> Result<(Child, Box
use std::process::Command;

let executable = address.as_ref();
// use unix_socket::UnixStream;
let (stream0, stream1) = UnixStream::pair().map_err(map_context!())?;
let fd = stream1.into_raw_fd();
let childin = unsafe { ::std::fs::File::from_raw_fd(fd) };
Expand Down
29 changes: 11 additions & 18 deletions varlink/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,11 @@ fn activation_listener() -> Option<usize> {

#[cfg(any(target_os = "linux", target_os = "android"))]
fn get_abstract_unixlistener(addr: &str) -> Result<UnixListener> {
// FIXME: abstract unix domains sockets still not in std
// FIXME: https://github.com/rust-lang/rust/issues/14194
use unix_socket::UnixListener as AbstractUnixListener;

unsafe {
Ok(UnixListener::from_raw_fd(
AbstractUnixListener::bind(addr)
.map_err(map_context!())?
.into_raw_fd(),
))
}
use std::os::linux::net::SocketAddrExt;
use std::os::unix::net::SocketAddr;

let addr = SocketAddr::from_abstract_name(addr).map_err(map_context!())?;
UnixListener::bind_addr(&addr).map_err(map_context!())
}

#[cfg(not(any(target_os = "linux", target_os = "android")))]
Expand Down Expand Up @@ -134,14 +128,13 @@ impl Listener {
Some(TcpListener::bind(addr).map_err(map_context!())?),
false,
))
} else if let Some(addr) = address.strip_prefix("unix:@") {
get_abstract_unixlistener(addr.split(';').next().unwrap_or(addr))
.map(|v| Listener::UNIX(Some(v), false))
} else if let Some(addr) = address.strip_prefix("unix:") {
let mut addr = String::from(addr.split(';').next().unwrap());
if addr.starts_with('@') {
addr = addr.replacen('@', "\0", 1);
return get_abstract_unixlistener(&addr).map(|v| Listener::UNIX(Some(v), false));
}
// ignore error on non-existant file
let _ = fs::remove_file(&*addr);
let addr = addr.split(';').next().unwrap_or(addr);
// ignore error on non-existent file
_ = fs::remove_file(addr);
Ok(Listener::UNIX(
Some(UnixListener::bind(addr).map_err(map_context!())?),
false,
Expand Down
Loading