YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

udp: mio socket worker: make send_response plain fn

Browse source
This commit is contained in:
Joakim Frostegård 2024-02-02 13:48:06 +01:00
parent 405bbaca93
commit be5165bcf2
1 changed files with 60 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

118
crates/udp/src/workers/socket/mio.rs
View file

@ -130,7 +130,7 @@ impl SocketWorker {
// If resend buffer is enabled, send any responses in it // If resend buffer is enabled, send any responses in it
if let Some(resend_buffer) = self.opt_resend_buffer.as_mut() { if let Some(resend_buffer) = self.opt_resend_buffer.as_mut() {
for (addr, response) in resend_buffer.drain(..) { for (addr, response) in resend_buffer.drain(..) {
Self::send_response( send_response(
&self.config, &self.config,
&self.statistics, &self.statistics,
&mut self.socket, &mut self.socket,
@ -241,7 +241,7 @@ impl SocketWorker {
message: err.into(), message: err.into(),
}; };
Self::send_response( send_response(
&self.config, &self.config,
&self.statistics, &self.statistics,
&mut self.socket, &mut self.socket,
@ -288,7 +288,7 @@ impl SocketWorker {
transaction_id: request.transaction_id, transaction_id: request.transaction_id,
}; };
Self::send_response( send_response(
&self.config, &self.config,
&self.statistics, &self.statistics,
&mut self.socket, &mut self.socket,
@ -324,7 +324,7 @@ impl SocketWorker {
message: "Info hash not allowed".into(), message: "Info hash not allowed".into(),
}; };
Self::send_response( send_response(
&self.config, &self.config,
&self.statistics, &self.statistics,
&mut self.socket, &mut self.socket,
@ -392,7 +392,7 @@ impl SocketWorker {
ConnectedResponse::AnnounceIpv6(r) => Response::AnnounceIpv6(r), ConnectedResponse::AnnounceIpv6(r) => Response::AnnounceIpv6(r),
}; };
Self::send_response( send_response(
&self.config, &self.config,
&self.statistics, &self.statistics,
&mut self.socket, &mut self.socket,
@ -403,71 +403,73 @@ impl SocketWorker {
); );
} }
} }
}
fn send_response( fn send_response(
config: &Config, config: &Config,
statistics: &CachePaddedArc<IpVersionStatistics<SocketWorkerStatistics>>, statistics: &CachePaddedArc<IpVersionStatistics<SocketWorkerStatistics>>,
socket: &mut UdpSocket, socket: &mut UdpSocket,
buffer: &mut [u8], buffer: &mut [u8],
opt_resend_buffer: &mut Option<Vec<(CanonicalSocketAddr, Response)>>, opt_resend_buffer: &mut Option<Vec<(CanonicalSocketAddr, Response)>>,
response: Response, response: Response,
canonical_addr: CanonicalSocketAddr, canonical_addr: CanonicalSocketAddr,
) { ) {
let mut buffer = Cursor::new(&mut buffer[..]); let mut buffer = Cursor::new(&mut buffer[..]);
if let Err(err) = response.write_bytes(&mut buffer) { if let Err(err) = response.write_bytes(&mut buffer) {
::log::error!("failed writing response to buffer: {:#}", err); ::log::error!("failed writing response to buffer: {:#}", err);
return; return;
} }
let bytes_written = buffer.position() as usize; let bytes_written = buffer.position() as usize;
let addr = if config.network.address.is_ipv4() { let addr = if config.network.address.is_ipv4() {
canonical_addr canonical_addr
.get_ipv4() .get_ipv4()
.expect("found peer ipv6 address while running bound to ipv4 address") .expect("found peer ipv6 address while running bound to ipv4 address")
} else { } else {
canonical_addr.get_ipv6_mapped() canonical_addr.get_ipv6_mapped()
}; };
match socket.send_to(&buffer.into_inner()[..bytes_written], addr) { match socket.send_to(&buffer.into_inner()[..bytes_written], addr) {
Ok(amt) if config.statistics.active() => { Ok(amt) if config.statistics.active() => {
let stats = if canonical_addr.is_ipv4() { let stats = if canonical_addr.is_ipv4() {
let stats = &statistics.ipv4; let stats = &statistics.ipv4;
stats stats
.bytes_sent .bytes_sent
.fetch_add(amt + EXTRA_PACKET_SIZE_IPV4, Ordering::Relaxed); .fetch_add(amt + EXTRA_PACKET_SIZE_IPV4, Ordering::Relaxed);
stats stats
} else { } else {
let stats = &statistics.ipv6; let stats = &statistics.ipv6;
stats stats
.bytes_sent .bytes_sent
.fetch_add(amt + EXTRA_PACKET_SIZE_IPV6, Ordering::Relaxed); .fetch_add(amt + EXTRA_PACKET_SIZE_IPV6, Ordering::Relaxed);
stats stats
}; };
match response { match response {
Response::Connect(_) => { Response::Connect(_) => {
stats.responses_connect.fetch_add(1, Ordering::Relaxed); stats.responses_connect.fetch_add(1, Ordering::Relaxed);
} }
Response::AnnounceIpv4(_) | Response::AnnounceIpv6(_) => { Response::AnnounceIpv4(_) | Response::AnnounceIpv6(_) => {
stats.responses_announce.fetch_add(1, Ordering::Relaxed); stats.responses_announce.fetch_add(1, Ordering::Relaxed);
} }
Response::Scrape(_) => { Response::Scrape(_) => {
stats.responses_scrape.fetch_add(1, Ordering::Relaxed); stats.responses_scrape.fetch_add(1, Ordering::Relaxed);
} }
Response::Error(_) => { Response::Error(_) => {
stats.responses_error.fetch_add(1, Ordering::Relaxed); stats.responses_error.fetch_add(1, Ordering::Relaxed);
}
} }
} }
Ok(_) => (), }
Err(err) => match opt_resend_buffer.as_mut() { Ok(_) => (),
Err(err) => {
match opt_resend_buffer.as_mut() {
Some(resend_buffer) Some(resend_buffer)
if (err.raw_os_error() == Some(libc::ENOBUFS)) if (err.raw_os_error() == Some(libc::ENOBUFS))
|| (err.kind() == ErrorKind::WouldBlock) => || (err.kind() == ErrorKind::WouldBlock) =>
@ -483,7 +485,7 @@ impl SocketWorker {
_ => { _ => {
::log::warn!("Sending response to {} failed: {:#}", addr, err); ::log::warn!("Sending response to {} failed: {:#}", addr, err);
} }
}, }
} }
} }
} }