YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-02 18:55:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

udp: uring: rewrite RecvHelper to use UnsafeCell

Browse source
This commit is contained in:
Joakim Frostegård 2023-03-08 13:43:11 +01:00
parent fa93f38d82
commit aa2c36a373
1 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

41
aquatic_udp/src/workers/socket/uring/recv_helper.rs
View file

@ -1,4 +1,5 @@
use std::{ use std::{
cell::UnsafeCell,
net::{IpAddr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6}, net::{IpAddr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6},
ptr::null_mut, ptr::null_mut,
}; };
@ -15,49 +16,49 @@ pub struct RecvHelper {
network_address: IpAddr, network_address: IpAddr,
max_scrape_torrents: u8, max_scrape_torrents: u8,
#[allow(dead_code)] #[allow(dead_code)]
name_v4: Box<libc::sockaddr_in>, name_v4: Box<UnsafeCell<libc::sockaddr_in>>,
msghdr_v4: Box<libc::msghdr>, msghdr_v4: Box<UnsafeCell<libc::msghdr>>,
#[allow(dead_code)] #[allow(dead_code)]
name_v6: Box<libc::sockaddr_in6>, name_v6: Box<UnsafeCell<libc::sockaddr_in6>>,
msghdr_v6: Box<libc::msghdr>, msghdr_v6: Box<UnsafeCell<libc::msghdr>>,
} }
impl RecvHelper { impl RecvHelper {
pub fn new(config: &Config) -> Self { pub fn new(config: &Config) -> Self {
let mut name_v4 = Box::new(libc::sockaddr_in { let name_v4 = Box::new(UnsafeCell::new(libc::sockaddr_in {
sin_family: 0, sin_family: 0,
sin_port: 0, sin_port: 0,
sin_addr: libc::in_addr { s_addr: 0 }, sin_addr: libc::in_addr { s_addr: 0 },
sin_zero: [0; 8], sin_zero: [0; 8],
}); }));
let msghdr_v4 = Box::new(libc::msghdr { let msghdr_v4 = Box::new(UnsafeCell::new(libc::msghdr {
msg_name: &mut name_v4 as *mut _ as *mut libc::c_void, msg_name: name_v4.get() as *mut libc::c_void,
msg_namelen: core::mem::size_of::<libc::sockaddr_in>() as u32, msg_namelen: core::mem::size_of::<libc::sockaddr_in>() as u32,
msg_iov: null_mut(), msg_iov: null_mut(),
msg_iovlen: 0, msg_iovlen: 0,
msg_control: null_mut(), msg_control: null_mut(),
msg_controllen: 0, msg_controllen: 0,
msg_flags: 0, msg_flags: 0,
}); }));
let mut name_v6 = Box::new(libc::sockaddr_in6 { let name_v6 = Box::new(UnsafeCell::new(libc::sockaddr_in6 {
sin6_family: 0, sin6_family: 0,
sin6_port: 0, sin6_port: 0,
sin6_flowinfo: 0, sin6_flowinfo: 0,
sin6_addr: libc::in6_addr { s6_addr: [0; 16] }, sin6_addr: libc::in6_addr { s6_addr: [0; 16] },
sin6_scope_id: 0, sin6_scope_id: 0,
}); }));
let msghdr_v6 = Box::new(libc::msghdr { let msghdr_v6 = Box::new(UnsafeCell::new(libc::msghdr {
msg_name: &mut name_v6 as *mut _ as *mut libc::c_void, msg_name: name_v6.get() as *mut libc::c_void,
msg_namelen: core::mem::size_of::<libc::sockaddr_in6>() as u32, msg_namelen: core::mem::size_of::<libc::sockaddr_in6>() as u32,
msg_iov: null_mut(), msg_iov: null_mut(),
msg_iovlen: 0, msg_iovlen: 0,
msg_control: null_mut(), msg_control: null_mut(),
msg_controllen: 0, msg_controllen: 0,
msg_flags: 0, msg_flags: 0,
}); }));
Self { Self {
network_address: config.network.address.ip(), network_address: config.network.address.ip(),
@ -71,9 +72,9 @@ impl RecvHelper {
pub fn create_entry(&self, buf_group: u16) -> io_uring::squeue::Entry { pub fn create_entry(&self, buf_group: u16) -> io_uring::squeue::Entry {
let msghdr: *const libc::msghdr = if self.network_address.is_ipv4() { let msghdr: *const libc::msghdr = if self.network_address.is_ipv4() {
&*self.msghdr_v4 self.msghdr_v4.get()
} else { } else {
&*self.msghdr_v6 self.msghdr_v6.get()
}; };
RecvMsgMulti::new(SOCKET_IDENTIFIER, msghdr, buf_group) RecvMsgMulti::new(SOCKET_IDENTIFIER, msghdr, buf_group)
@ -85,10 +86,12 @@ impl RecvHelper {
&self, &self,
buffer: &[u8], buffer: &[u8],
) -> (Result<Request, RequestParseError>, CanonicalSocketAddr) { ) -> (Result<Request, RequestParseError>, CanonicalSocketAddr) {
let msghdr = if self.network_address.is_ipv4() { let msghdr = unsafe {
&self.msghdr_v4 if self.network_address.is_ipv4() {
&*(self.msghdr_v4.get() as *const _)
} else { } else {
&self.msghdr_v6 &*(self.msghdr_v6.get() as *const _)
}
}; };
let msg = RecvMsgOut::parse(buffer, msghdr).unwrap(); let msg = RecvMsgOut::parse(buffer, msghdr).unwrap();