blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove InetAddr from streamer/src/sendmmsg.rs (#557) 

* remove InetAddr from streamer/src/sendmmsg.rs

* add ref links

* use SocketAddr conversion directly
This commit is contained in:
Yihau Chen 2024-04-07 00:35:31 +08:00 committed by GitHub
parent be09b497cb
commit 01460ef5cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
streamer/src/sendmmsg.rs
View File

@ -1,8 +1,5 @@
//! The `sendmmsg` module provides sendmmsg() API implementation //! The `sendmmsg` module provides sendmmsg() API implementation
#[cfg(target_os = "linux")]
#[allow(deprecated)]
use nix::sys::socket::InetAddr;
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
use { use {
itertools::izip, itertools::izip,
@ -76,21 +73,26 @@ fn mmsghdr_for_packet(
hdr.msg_hdr.msg_iovlen = 1; hdr.msg_hdr.msg_iovlen = 1;
hdr.msg_hdr.msg_name = addr as *mut _ as *mut _; hdr.msg_hdr.msg_name = addr as *mut _ as *mut _;
#[allow(deprecated)] match dest {
match InetAddr::from_std(dest) { SocketAddr::V4(socket_addr_v4) => {
InetAddr::V4(dest) => {
unsafe { unsafe {
std::ptr::write(addr as *mut _ as *mut _, dest); std::ptr::write(
addr as *mut _ as *mut _,
*nix::sys::socket::SockaddrIn::from(*socket_addr_v4).as_ref(),
);
} }
hdr.msg_hdr.msg_namelen = SIZE_OF_SOCKADDR_IN as u32; hdr.msg_hdr.msg_namelen = SIZE_OF_SOCKADDR_IN as u32;
} }
InetAddr::V6(dest) => { SocketAddr::V6(socket_addr_v6) => {
unsafe { unsafe {
std::ptr::write(addr as *mut _ as *mut _, dest); std::ptr::write(
addr as *mut _ as *mut _,
*nix::sys::socket::SockaddrIn6::from(*socket_addr_v6).as_ref(),
);
} }
hdr.msg_hdr.msg_namelen = SIZE_OF_SOCKADDR_IN6 as u32; hdr.msg_hdr.msg_namelen = SIZE_OF_SOCKADDR_IN6 as u32;
} }
}; }
} }
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]