archive/tuic
1
0
Fork 0
Code

using dual-stack socket in server UdpSession

Browse Source
This commit is contained in:
EAimTY 2022-07-30 17:29:30 +09:00
parent c9b3fd3928
commit 57c5b6b665
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/src/connection/udp.rs
View File

@ -1,10 +1,11 @@
use bytes::Bytes; use bytes::Bytes;
use crossbeam_utils::atomic::AtomicCell; use crossbeam_utils::atomic::AtomicCell;
use parking_lot::Mutex; use parking_lot::Mutex;
use socket2::{Domain, Protocol, SockAddr, Socket, Type};
use std::{ use std::{
collections::HashMap, collections::HashMap,
io::Error as IoError, io::Result,
net::{Ipv6Addr, SocketAddr}, net::{Ipv6Addr, SocketAddr, UdpSocket as StdUdpSocket},
sync::Arc, sync::Arc,
}; };
use tokio::{ use tokio::{
@ -76,7 +77,7 @@ impl UdpSessionMap {
pkt: Bytes, pkt: Bytes,
addr: Address, addr: Address,
src_addr: SocketAddr, src_addr: SocketAddr,
) -> Result<(), IoError> { ) -> Result<()> {
let map = self.map.lock(); let map = self.map.lock();
let send_pkt_tx = if let Some(session) = map.get(&assoc_id) { let send_pkt_tx = if let Some(session) = map.get(&assoc_id) {
@ -122,8 +123,16 @@ impl UdpSession {
recv_pkt_tx: RecvPacketSender, recv_pkt_tx: RecvPacketSender,
src_addr: SocketAddr, src_addr: SocketAddr,
max_pkt_size: usize, max_pkt_size: usize,
) -> Result<Self, IoError> { ) -> Result<Self> {
let socket = Arc::new(UdpSocket::bind(SocketAddr::from((Ipv6Addr::UNSPECIFIED, 0))).await?); let socket = Arc::new({
let socket = Socket::new(Domain::IPV6, Type::DGRAM, Some(Protocol::UDP))?;
socket.set_only_v6(false)?;
socket.bind(&SockAddr::from(SocketAddr::from((
Ipv6Addr::UNSPECIFIED,
0,
))))?;
UdpSocket::from_std(StdUdpSocket::from(socket))?
});
let (send_pkt_tx, send_pkt_rx) = mpsc::channel(1); let (send_pkt_tx, send_pkt_rx) = mpsc::channel(1);
tokio::spawn(async move { tokio::spawn(async move {
@ -142,7 +151,7 @@ impl UdpSession {
async fn listen_send_packet( async fn listen_send_packet(
socket: Arc<UdpSocket>, socket: Arc<UdpSocket>,
mut send_pkt_rx: SendPacketReceiver, mut send_pkt_rx: SendPacketReceiver,
) -> Result<(), IoError> { ) -> Result<()> {
while let Some((pkt, addr)) = send_pkt_rx.recv().await { while let Some((pkt, addr)) = send_pkt_rx.recv().await {
match addr { match addr {
Address::DomainAddress(hostname, port) => { Address::DomainAddress(hostname, port) => {
@ -162,7 +171,7 @@ impl UdpSession {
assoc_id: u32, assoc_id: u32,
recv_pkt_tx: RecvPacketSender, recv_pkt_tx: RecvPacketSender,
max_pkt_size: usize, max_pkt_size: usize,
) -> Result<(), IoError> { ) -> Result<()> {
loop { loop {
let mut buf = vec![0; max_pkt_size]; let mut buf = vec![0; max_pkt_size];
let (len, addr) = socket.recv_from(&mut buf).await?; let (len, addr) = socket.recv_from(&mut buf).await?;