mirror of
https://github.com/shadowsocks/shadowsocks-rust.git
synced 2026-02-09 01:59:16 +08:00
fix: fixed build on openbsd (#1934)
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
use std::{
|
||||
io,io::ErrorKind
|
||||
io,
|
||||
io::ErrorKind,
|
||||
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
|
||||
ops::{Deref, DerefMut},
|
||||
os::fd::AsRawFd,
|
||||
@@ -15,7 +16,7 @@ use tokio::{
|
||||
|
||||
use crate::net::{
|
||||
AcceptOpts, AddrFamily, ConnectOpts,
|
||||
sys::{ErrorKind, set_common_sockopt_after_connect, set_common_sockopt_for_connect, io::Error},
|
||||
sys::{ErrorKind, io::Error, set_common_sockopt_after_connect, set_common_sockopt_for_connect},
|
||||
};
|
||||
|
||||
/// A wrapper of `TcpStream`
|
||||
@@ -88,13 +89,13 @@ pub async fn create_outbound_udp_socket(af: AddrFamily, config: &ConnectOpts) ->
|
||||
Some(addr) => SocketAddr::new(IpAddr::from(addr), 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)
|
||||
},
|
||||
}
|
||||
(AddrFamily::Ipv4, ..) => SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 0),
|
||||
(AddrFamily::Ipv6, ..) => SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 0),
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user