bump deps

Author: erebe

Cargo.lock

@@ -5,9 +5,9 @@ edition = "2024"
 
 [dependencies]
 anyhow = "1.0.98"
-clap = { version = "4.5.40", features = ["derive", "env"] }
+clap = { version = "4.5.41", features = ["derive", "env"] }
 fdlimit = "0.3.0"
-tokio = { version = "1.45.1", features = ["full"] }
+tokio = { version = "1.46.1", features = ["full"] }
 tracing = { version = "0.1.41", features = ["log"] }
 tracing-subscriber = { version = "0.3.19", features = ["env-filter", "fmt", "local-time"] }
 wstunnel = { path = "../wstunnel" , default-features = false, features = ["clap"] }

wstunnel-cli/Cargo.toml

@@ -13,12 +13,12 @@ scopeguard = "1.2.0"
 
 bb8 = { version = "0.9.0", features = [] }
 bytes = { version = "1.10.1", features = [] }
-clap = { version = "4.5.40", features = ["derive", "env"], optional = true }
+clap = { version = "4.5.41", features = ["derive", "env"], optional = true }
 fast-socks5 = { version = "0.10.0", features = [] }
 fastwebsockets = { version = "0.10.0", features = ["upgrade", "simd", "unstable-split"] }
 futures-util = { version = "0.3.31" }
 ppp = { version = "2.3.0", features = [] }
-async-channel = { version = "2.3.1", features = [] }
+async-channel = { version = "2.5.0", features = [] }
 arc-swap = { version = "1.7.1", features = [] }
 
 # For config file parsing
@@ -28,22 +28,22 @@ serde_yaml = { version = "0.9.34", features = [] }
 ipnet = { version = "2.11.0", features = ["serde"] }
 
 hyper = { version = "1.6.0", features = ["client", "http1", "http2"] }
-hyper-util = { version = "0.1.14", features = ["tokio", "server", "server-auto"] }
+hyper-util = { version = "0.1.15", features = ["tokio", "server", "server-auto"] }
 http-body-util = { version = "0.1.3" }
 jsonwebtoken = { version = "9.3.1", default-features = false }
 log = "0.4.27"
 nix = { version = "0.30.1", features = ["socket", "net", "uio"] }
 parking_lot = "0.12.4"
 pin-project = "1"
-notify = { version = "8.0.0", features = [] }
+notify = { version = "8.1.0", features = [] }
 httparse = { version = "1.10.1", features = [] }
 
 rustls-native-certs = { version = "0.8.1", features = [] }
 rustls-pemfile = { version = "2.2.0", features = [] }
 x509-parser = "0.17.0"
 serde = { version = "1.0.219", features = ["derive"] }
-socket2 = { version = "0.5.10", features = [] }
-tokio = { version = "1.45.1", features = ["io-std", "net", "signal", "sync", "time"] }
+socket2 = { version = "0.6.0", features = ["all"] }
+tokio = { version = "1.46.1", features = ["io-std", "net", "signal", "sync", "time"] }
 tokio-stream = { version = "0.1.17", features = ["net"] }
 
 tracing = { version = "0.1.41", features = ["log"] }
@@ -53,7 +53,7 @@ uuid = { version = "1.17.0", features = ["v7", "serde"] }
 derive_more = { version = "2.0.1", features = ["display", "error"] }
 
 tokio-rustls = { version = "0.26.2", default-features = false, features = ["logging", "tls12"] }
-rcgen = { version = "0.13.2", default-features = false, features = [] }
+rcgen = { version = "0.14.2", default-features = false, features = [] }
 hickory-resolver = { version = "0.25.2", default-features = false, features = ["system-config", "tokio", "rustls-platform-verifier"] }
 aws-lc-rs = { version = "*", optional = true }
 

wstunnel/Cargo.toml

@@ -21,7 +21,7 @@ use url::{Host, Url};
 
 pub fn configure_socket(socket: SockRef, so_mark: SoMark) -> Result<(), anyhow::Error> {
     socket
-        .set_nodelay(true)
+        .set_tcp_nodelay(true)
         .with_context(|| format!("cannot set no_delay on socket: {:?}", io::Error::last_os_error()))?;
 
     #[cfg(not(any(target_os = "windows", target_os = "openbsd")))]
@@ -219,7 +219,7 @@ pub async fn run_server(bind: SocketAddr, ip_transparent: bool) -> Result<TcpLis
     #[cfg(target_os = "linux")]
     if ip_transparent {
         info!("TCP server listening in TProxy mode");
-        socket2::SockRef::from(&listener).set_ip_transparent(ip_transparent)?;
+        socket2::SockRef::from(&listener).set_ip_transparent_v4(ip_transparent)?;
     }
 
     Ok(TcpListenerStream::new(listener))

wstunnel/src/protocols/tcp/server.rs

@@ -434,7 +434,7 @@ pub fn configure_tproxy(listener: &UdpSocket) -> anyhow::Result<()> {
     use std::net::IpAddr;
     use std::os::fd::AsFd;
 
-    socket2::SockRef::from(&listener).set_ip_transparent(true)?;
+    socket2::SockRef::from(&listener).set_ip_transparent_v4(true)?;
     match listener.local_addr().unwrap().ip() {
         IpAddr::V4(_) => {
             nix::sys::socket::setsockopt(&listener.as_fd(), nix::sys::socket::sockopt::Ipv4OrigDstAddr, &true)?;
@@ -488,7 +488,7 @@ pub fn mk_send_socket_tproxy(listener: &Arc<UdpSocket>) -> anyhow::Result<Arc<Ud
     }
 
     let socket = Socket::new(Domain::for_address(remote_addr), Type::DGRAM, Some(Protocol::UDP))?;
-    socket.set_ip_transparent(true)?;
+    socket.set_ip_transparent_v4(true)?;
     socket.set_reuse_address(true)?;
     socket.set_reuse_port(true)?;
     socket.bind(&SockAddr::from(remote_addr))?;