diff --git a/crates/shadowsocks-service/Cargo.toml b/crates/shadowsocks-service/Cargo.toml index 65794b5b..4c2d3e2d 100644 --- a/crates/shadowsocks-service/Cargo.toml +++ b/crates/shadowsocks-service/Cargo.toml @@ -89,7 +89,7 @@ rustls-native-certs = { version = "0.5", optional = true } async-trait = "0.1" mio = { version = "0.7", optional = true } -socket2 = "0.3" +socket2 = { version = "0.3", features = ["reuseport"] } libc = "0.2" http = { version = "0.2", optional = true } diff --git a/crates/shadowsocks-service/src/local/redir/udprelay/mod.rs b/crates/shadowsocks-service/src/local/redir/udprelay/mod.rs index 7de04714..69967bcc 100644 --- a/crates/shadowsocks-service/src/local/redir/udprelay/mod.rs +++ b/crates/shadowsocks-service/src/local/redir/udprelay/mod.rs @@ -49,7 +49,10 @@ impl UdpInboundWrite for UdpRedirInboundWriter { // Create a socket binds to destination addr // This only works for systems that supports binding to non-local addresses - let inbound = UdpRedirSocket::bind(self.redir_ty, addr)?; + // + // This socket has to set SO_REUSEADDR and SO_REUSEPORT. + // Outbound addresses could be connected from different source addresses. + let inbound = UdpRedirSocket::bind_nonlocal(self.redir_ty, addr)?; // Send back to client inbound.send_to(data, peer_addr).await.map(|_| ()) @@ -80,10 +83,10 @@ impl UdpRedir { pub async fn run(&self, client_config: &ClientConfig, balancer: PingBalancer) -> io::Result<()> { let listener = match *client_config { - ClientConfig::SocketAddr(ref saddr) => UdpRedirSocket::bind(self.redir_ty, *saddr)?, + ClientConfig::SocketAddr(ref saddr) => UdpRedirSocket::listen(self.redir_ty, *saddr)?, ClientConfig::DomainName(ref dname, port) => { lookup_then!(self.context.context_ref(), dname, port, |addr| { - UdpRedirSocket::bind(self.redir_ty, addr) + UdpRedirSocket::listen(self.redir_ty, addr) })? .1 } diff --git a/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs b/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs index 970aad91..c0b9c5be 100644 --- a/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs +++ b/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs @@ -23,10 +23,21 @@ pub struct UdpRedirSocket { } impl UdpRedirSocket { + /// Create a new UDP socket binded to `addr` + /// + /// This will allow listening to `addr` that is not in local host + pub fn listen(ty: RedirType, addr: SocketAddr) -> io::Result { + UdpRedirSocket::bind(ty, addr, false) + } + /// Create a new UDP socket binded to `addr` /// /// This will allow binding to `addr` that is not in local host - pub fn bind(ty: RedirType, addr: SocketAddr) -> io::Result { + pub fn bind_nonlocal(ty: RedirType, addr: SocketAddr) -> io::Result { + UdpRedirSocket::bind(ty, addr, true) + } + + fn bind(ty: RedirType, addr: SocketAddr, reuse_port: bool) -> io::Result { if ty == RedirType::NotSupported { return Err(Error::new( ErrorKind::InvalidInput, @@ -43,6 +54,9 @@ impl UdpRedirSocket { socket.set_nonblocking(true)?; socket.set_reuse_address(true)?; + if reuse_port { + socket.set_reuse_port(true)?; + } socket.bind(&SockAddr::from(addr))?; diff --git a/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/linux.rs b/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/linux.rs index ca6940d7..bb1d812d 100644 --- a/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/linux.rs +++ b/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/linux.rs @@ -19,10 +19,21 @@ pub struct UdpRedirSocket { } impl UdpRedirSocket { + /// Create a new UDP socket binded to `addr` + /// + /// This will allow listening to `addr` that is not in local host + pub fn listen(ty: RedirType, addr: SocketAddr) -> io::Result { + UdpRedirSocket::bind(ty, addr, false) + } + /// Create a new UDP socket binded to `addr` /// /// This will allow binding to `addr` that is not in local host - pub fn bind(ty: RedirType, addr: SocketAddr) -> io::Result { + pub fn bind_nonlocal(ty: RedirType, addr: SocketAddr) -> io::Result { + UdpRedirSocket::bind(ty, addr, true) + } + + fn bind(ty: RedirType, addr: SocketAddr, reuse_port: bool) -> io::Result { if ty != RedirType::TProxy { return Err(Error::new( ErrorKind::InvalidInput, @@ -39,6 +50,9 @@ impl UdpRedirSocket { socket.set_nonblocking(true)?; socket.set_reuse_address(true)?; + if reuse_port { + socket.set_reuse_port(true)?; + } socket.bind(&SockAddr::from(addr))?; diff --git a/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/macos.rs b/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/macos.rs index 9ad1b9c6..9da31894 100644 --- a/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/macos.rs +++ b/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/macos.rs @@ -9,10 +9,21 @@ use crate::{config::RedirType, local::redir::redir_ext::UdpSocketRedir}; pub struct UdpRedirSocket; impl UdpRedirSocket { + /// Create a new UDP socket binded to `addr` + /// + /// This will allow listening to `addr` that is not in local host + pub fn listen(ty: RedirType, addr: SocketAddr) -> io::Result { + UdpRedirSocket::bind(ty, addr, false) + } + /// Create a new UDP socket binded to `addr` /// /// This will allow binding to `addr` that is not in local host - pub fn bind(_ty: RedirType, _addr: SocketAddr) -> io::Result { + pub fn bind_nonlocal(ty: RedirType, addr: SocketAddr) -> io::Result { + UdpRedirSocket::bind(ty, addr, true) + } + + fn bind(_ty: RedirType, _addr: SocketAddr, _reuse_port: bool) -> io::Result { unimplemented!("UDP transparent proxy is not supported on macOS, iOS, ...") } diff --git a/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/not_supported.rs b/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/not_supported.rs index 4d19ca06..5187717d 100644 --- a/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/not_supported.rs +++ b/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/not_supported.rs @@ -5,10 +5,21 @@ use crate::{config::RedirType, local::redir::redir_ext::UdpSocketRedir}; pub struct UdpRedirSocket; impl UdpRedirSocket { + /// Create a new UDP socket binded to `addr` + /// + /// This will allow listening to `addr` that is not in local host + pub fn listen(ty: RedirType, addr: SocketAddr) -> io::Result { + UdpRedirSocket::bind(ty, addr, false) + } + /// Create a new UDP socket binded to `addr` /// /// This will allow binding to `addr` that is not in local host - pub fn bind(_ty: RedirType, _addr: SocketAddr) -> io::Result { + pub fn bind_nonlocal(ty: RedirType, addr: SocketAddr) -> io::Result { + UdpRedirSocket::bind(ty, addr, true) + } + + fn bind(_ty: RedirType, _addr: SocketAddr, _reuse_port: bool) -> io::Result { unimplemented!("UDP transparent proxy is not supported on this platform") } diff --git a/crates/shadowsocks-service/src/local/redir/udprelay/sys/windows/mod.rs b/crates/shadowsocks-service/src/local/redir/udprelay/sys/windows/mod.rs index 7fe3c703..ac26aba7 100644 --- a/crates/shadowsocks-service/src/local/redir/udprelay/sys/windows/mod.rs +++ b/crates/shadowsocks-service/src/local/redir/udprelay/sys/windows/mod.rs @@ -5,10 +5,21 @@ use crate::{config::RedirType, local::redir::redir_ext::UdpSocketRedir}; pub struct UdpRedirSocket; impl UdpRedirSocket { + /// Create a new UDP socket binded to `addr` + /// + /// This will allow listening to `addr` that is not in local host + pub fn listen(ty: RedirType, addr: SocketAddr) -> io::Result { + UdpRedirSocket::bind(ty, addr, false) + } + /// Create a new UDP socket binded to `addr` /// /// This will allow binding to `addr` that is not in local host - pub fn bind(_ty: RedirType, _addr: &SocketAddr) -> io::Result { + pub fn bind_nonlocal(ty: RedirType, addr: SocketAddr) -> io::Result { + UdpRedirSocket::bind(ty, addr, true) + } + + fn bind(_ty: RedirType, _addr: SocketAddr, _reuse_port: bool) -> io::Result { unimplemented!("UDP transparent proxy is not supported on Windows") }