source/shadowsocks-rust
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-rust.git synced 2026-02-09 10:09:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(shadowsocks): use type inferation (#1928)

Browse Source
This commit is contained in:
zonyitoo
2025-04-03 23:51:26 +08:00
parent 3cf9c31ba7
commit 93ebaa3684
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/shadowsocks/src/net/sys/unix/bsd/freebsd.rs
View File

@@ -1,6 +1,6 @@
use std::{
io, mem, io:ErrorKind,
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
net::{Ipv4Addr, Ipv6Addr, SocketAddr},
os::unix::io::{AsRawFd, RawFd},
pin::Pin,
ptr,
@@ -231,15 +231,14 @@ pub async fn create_outbound_udp_socket(af: AddrFamily, config: &ConnectOpts) ->
(AddrFamily::Ipv4, Some(SocketAddr::V6(addr))) => {
// Map IPv6 bind_local_addr to IPv4 if AF is IPv4
match addr.ip().to_ipv4_mapped() {
Some(addr) => SocketAddr::new(IpAddr::from(addr), 0),
Some(addr) => SocketAddr::new(addr.into(), 0),
None => return Err(Error::new(ErrorKind::InvalidInput, "Invalid IPv6 address")),
}
},
(AddrFamily::Ipv6, Some(SocketAddr::V6(addr))) => addr.into(),
(AddrFamily::Ipv6, Some(SocketAddr::V4(addr))) => {
// Map IPv4 bind_local_addr to IPv6 if AF is IPv6
let ip_addr: IpAddr = addr.ip().to_ipv6_mapped().into();
SocketAddr::new(ip_addr, 0)
SocketAddr::new(addr.ip().to_ipv6_mapped().into(), 0)
},
(AddrFamily::Ipv4, ..) => SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 0),
(AddrFamily::Ipv6, ..) => SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 0),

13
crates/shadowsocks/src/net/sys/unix/bsd/macos.rs
View File

@@ -3,7 +3,7 @@ use std::{
collections::HashMap,
io::{self, ErrorKind},
mem,
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, TcpStream as StdTcpStream},
net::{Ipv4Addr, Ipv6Addr, SocketAddr, TcpStream as StdTcpStream},
os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd},
pin::Pin,
ptr,
@@ -23,7 +23,7 @@ use tokio_tfo::TfoStream;
use crate::net::{
AcceptOpts, AddrFamily, ConnectOpts,
sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, socket_bind_dual_stack, io::Error},
sys::{io::Error, set_common_sockopt_after_connect, set_common_sockopt_for_connect, socket_bind_dual_stack},
udp::{BatchRecvMessage, BatchSendMessage},
};
@@ -359,16 +359,15 @@ pub async fn create_outbound_udp_socket(af: AddrFamily, config: &ConnectOpts) ->
(AddrFamily::Ipv4, Some(SocketAddr::V6(addr))) => {
// Map IPv6 bind_local_addr to IPv4 if AF is IPv4
match addr.ip().to_ipv4_mapped() {
Some(addr) => SocketAddr::new(IpAddr::from(addr), 0),
Some(addr) => SocketAddr::new(addr.into(), 0),
None => return Err(Error::new(ErrorKind::InvalidInput, "Invalid IPv6 address")),
}
},
}
(AddrFamily::Ipv6, Some(SocketAddr::V6(addr))) => addr.into(),
(AddrFamily::Ipv6, Some(SocketAddr::V4(addr))) => {
// Map IPv4 bind_local_addr to IPv6 if AF is IPv6
let ip_addr: IpAddr = addr.ip().to_ipv6_mapped().into();
SocketAddr::new(ip_addr, 0)
},
SocketAddr::new(addr.ip().to_ipv6_mapped().into(), 0)
}
(AddrFamily::Ipv4, ..) => SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 0),
(AddrFamily::Ipv6, ..) => SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 0),
};

17
crates/shadowsocks/src/net/sys/unix/linux/mod.rs
View File

@@ -1,6 +1,8 @@
use std::{
io, mem, io::ErrorKind,
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
io,
io::ErrorKind,
mem,
net::{Ipv4Addr, Ipv6Addr, SocketAddr},
os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd},
pin::Pin,
ptr,
@@ -20,7 +22,7 @@ use tokio_tfo::TfoStream;
use crate::net::{
AcceptOpts, AddrFamily, ConnectOpts,
sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, socket_bind_dual_stack, io::Error},
sys::{io::Error, set_common_sockopt_after_connect, set_common_sockopt_for_connect, socket_bind_dual_stack},
udp::{BatchRecvMessage, BatchSendMessage},
};
@@ -290,16 +292,15 @@ pub async fn create_outbound_udp_socket(af: AddrFamily, config: &ConnectOpts) ->
(AddrFamily::Ipv4, Some(SocketAddr::V6(addr))) => {
// Map IPv6 bind_local_addr to IPv4 if AF is IPv4
match addr.ip().to_ipv4_mapped() {
Some(addr) => SocketAddr::new(IpAddr::from(addr), 0),
Some(addr) => SocketAddr::new(addr.into(), 0),
None => return Err(Error::new(ErrorKind::InvalidInput, "Invalid IPv6 address")),
}
},
}
(AddrFamily::Ipv6, Some(SocketAddr::V6(addr))) => addr.into(),
(AddrFamily::Ipv6, Some(SocketAddr::V4(addr))) => {
// Map IPv4 bind_local_addr to IPv6 if AF is IPv6
let ip_addr: IpAddr = addr.ip().to_ipv6_mapped().into();
SocketAddr::new(ip_addr, 0)
},
SocketAddr::new(addr.ip().to_ipv6_mapped().into(), 0)
}
(AddrFamily::Ipv4, ..) => SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 0),
(AddrFamily::Ipv6, ..) => SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 0),
};

9
crates/shadowsocks/src/net/sys/windows/mod.rs
View File

@@ -471,16 +471,15 @@ pub async fn create_outbound_udp_socket(af: AddrFamily, opts: &ConnectOpts) -> i
(AddrFamily::Ipv4, Some(SocketAddr::V6(addr))) => {
// Map IPv6 bind_local_addr to IPv4 if AF is IPv4
match addr.ip().to_ipv4_mapped() {
Some(addr) => SocketAddr::new(IpAddr::from(addr), 0),
Some(addr) => SocketAddr::new(addr.into(), 0),
None => return Err(io::Error::new(ErrorKind::InvalidInput, "Invalid IPv6 address")),
}
},
}
(AddrFamily::Ipv6, Some(SocketAddr::V6(addr))) => addr.into(),
(AddrFamily::Ipv6, Some(SocketAddr::V4(addr))) => {
// Map IPv4 bind_local_addr to IPv6 if AF is IPv6
let ip_addr: IpAddr = addr.ip().to_ipv6_mapped().into();
SocketAddr::new(ip_addr, 0)
},
SocketAddr::new(addr.ip().to_ipv6_mapped().into(), 0)
}
(AddrFamily::Ipv4, ..) => SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 0),
(AddrFamily::Ipv6, ..) => SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 0),
};