From 060474fcc70542a2246f83c7de99f2fda4220539 Mon Sep 17 00:00:00 2001 From: ssrlive <30760636+ssrlive@users.noreply.github.com> Date: Sun, 20 Oct 2024 16:38:14 +0800 Subject: [PATCH] nix usage --- Cargo.toml | 10 +++++----- src/bin/udpgw_server.rs | 2 +- src/error.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 24ebc64..bb61ca9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,11 +42,6 @@ url = "2" [target.'cfg(target_os="linux")'.dependencies] serde = { version = "1", features = ["derive"] } bincode = "1" -nix = { version = "0.29", default-features = false, features = [ - "fs", - "socket", - "uio", -] } [target.'cfg(target_os="android")'.dependencies] android_logger = "0.14" @@ -54,6 +49,11 @@ jni = { version = "0.21", default-features = false } [target.'cfg(unix)'.dependencies] daemonize = "0.5" +nix = { version = "0.29", default-features = false, features = [ + "fs", + "socket", + "uio", +] } [target.'cfg(target_os = "windows")'.dependencies] windows-service = "0.7" diff --git a/src/bin/udpgw_server.rs b/src/bin/udpgw_server.rs index 97f0643..9e1a728 100644 --- a/src/bin/udpgw_server.rs +++ b/src/bin/udpgw_server.rs @@ -180,7 +180,7 @@ pub fn parse_udp(udp_mtu: u16, data_len: usize, data: &[u8]) -> Result<(&[u8], u async fn process_udp(addr: SocketAddr, udp_timeout: u64, tx: Sender>, con: &mut UdpRequest) -> Result<()> { let std_sock = std::net::UdpSocket::bind("0.0.0.0:0")?; std_sock.set_nonblocking(true)?; - #[cfg(target_os = "linux")] + #[cfg(unix)] nix::sys::socket::setsockopt(&std_sock, nix::sys::socket::sockopt::ReuseAddr, &true)?; let socket = UdpSocket::from_std(std_sock)?; socket.send_to(&con.data, &con.server_addr).await?; diff --git a/src/error.rs b/src/error.rs index f460b62..755ee0c 100644 --- a/src/error.rs +++ b/src/error.rs @@ -6,7 +6,7 @@ pub enum Error { #[error(transparent)] Io(#[from] std::io::Error), - #[cfg(target_os = "linux")] + #[cfg(unix)] #[error("nix::errno::Errno {0:?}")] NixErrno(#[from] nix::errno::Errno),