mirror of
https://github.com/EasyTier/EasyTier.git
synced 2026-09-03 09:35:41 +00:00
refactor: remove NoGroAsyncUdpSocket (#1867)
This commit is contained in:
@@ -26,7 +26,9 @@ use derivative::Derivative;
|
||||
use derive_more::{Constructor, Deref, DerefMut, From, Into};
|
||||
use prost::Message;
|
||||
use quinn::udp::{EcnCodepoint, RecvMeta, Transmit};
|
||||
use quinn::{AsyncUdpSocket, Endpoint, RecvStream, SendStream, StreamId, TokioRuntime, UdpPoller};
|
||||
use quinn::{
|
||||
AsyncUdpSocket, Endpoint, RecvStream, SendStream, StreamId, UdpPoller, default_runtime,
|
||||
};
|
||||
use std::cmp::min;
|
||||
use std::future::Future;
|
||||
use std::io::IoSliceMut;
|
||||
@@ -806,7 +808,7 @@ impl QuicProxy {
|
||||
endpoint_config(),
|
||||
Some(server_config()),
|
||||
Arc::new(socket),
|
||||
Arc::new(TokioRuntime),
|
||||
default_runtime().unwrap(),
|
||||
)
|
||||
.unwrap();
|
||||
endpoint.set_default_client_config(client_config());
|
||||
@@ -1020,7 +1022,7 @@ mod tests {
|
||||
endpoint_config.clone(),
|
||||
Some(server_config.clone()),
|
||||
socket_client.clone(),
|
||||
Arc::new(TokioRuntime),
|
||||
default_runtime().unwrap(),
|
||||
)
|
||||
.unwrap();
|
||||
client_endpoint.set_default_client_config(client_config.clone());
|
||||
@@ -1030,7 +1032,7 @@ mod tests {
|
||||
endpoint_config.clone(),
|
||||
Some(server_config.clone()),
|
||||
socket_server.clone(),
|
||||
Arc::new(TokioRuntime),
|
||||
default_runtime().unwrap(),
|
||||
)
|
||||
.unwrap();
|
||||
server_endpoint.set_default_client_config(client_config.clone());
|
||||
|
||||
@@ -31,7 +31,7 @@ use crate::{
|
||||
tokio_smoltcp::{BufferSize, Net, NetConfig, channel_device},
|
||||
},
|
||||
tunnel::{
|
||||
common::setup_sokcet2,
|
||||
common::setup_socket2,
|
||||
packet_def::{PacketType, ZCPacket},
|
||||
},
|
||||
};
|
||||
@@ -336,7 +336,7 @@ fn bind_tcp_socket(addr: SocketAddr, net_ns: NetNS) -> Result<TcpListener, Error
|
||||
Some(socket2::Protocol::TCP),
|
||||
)?;
|
||||
|
||||
setup_sokcet2(&socket2_socket, &addr)?;
|
||||
setup_socket2(&socket2_socket, &addr, true)?;
|
||||
|
||||
let socket = TcpSocket::from_std_stream(socket2_socket.into());
|
||||
|
||||
@@ -355,7 +355,7 @@ fn bind_udp_socket(addr: SocketAddr, net_ns: NetNS) -> Result<UdpSocket, Error>
|
||||
Some(socket2::Protocol::UDP),
|
||||
)?;
|
||||
|
||||
setup_sokcet2(&socket2_socket, &addr)?;
|
||||
setup_socket2(&socket2_socket, &addr, true)?;
|
||||
|
||||
Ok(UdpSocket::from_std(socket2_socket.into())?)
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ use crate::{
|
||||
gateway::ip_reassembler::{ComposeIpv4PacketArgs, compose_ipv4_packet},
|
||||
peers::{PeerPacketFilter, peer_manager::PeerManager},
|
||||
tunnel::{
|
||||
common::{reserve_buf, setup_sokcet2},
|
||||
common::{reserve_buf, setup_socket2},
|
||||
packet_def::{PacketType, ZCPacket},
|
||||
},
|
||||
};
|
||||
@@ -72,7 +72,7 @@ impl UdpNatEntry {
|
||||
Some(socket2::Protocol::UDP),
|
||||
)?;
|
||||
let dst_socket_addr = "0.0.0.0:0".parse().unwrap();
|
||||
setup_sokcet2(&socket2_socket, &dst_socket_addr)?;
|
||||
setup_socket2(&socket2_socket, &dst_socket_addr, true)?;
|
||||
Some(UdpSocket::from_std(socket2_socket.into())?)
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user