mirror of
https://github.com/YGGverse/aquatic.git
synced 2026-03-31 17:55:36 +00:00
udp: mio: make send_response a method
This commit is contained in:
Joakim Frostegård
parent
7116fdd862
commit
19533b3f8e
1 changed files with 82 additions and 130 deletions
|
|
@ -30,7 +30,6 @@ pub struct SocketWorker {
|
|||
access_list_cache: AccessListCache,
|
||||
validator: ConnectionValidator,
|
||||
socket: UdpSocket,
|
||||
opt_resend_buffer: Option<Vec<(CanonicalSocketAddr, Response)>>,
|
||||
buffer: [u8; BUFFER_SIZE],
|
||||
rng: SmallRng,
|
||||
}
|
||||
|
|
@ -46,7 +45,6 @@ impl SocketWorker {
|
|||
) -> anyhow::Result<()> {
|
||||
let socket = UdpSocket::from_std(create_socket(&config, priv_dropper)?);
|
||||
let access_list_cache = create_access_list_cache(&shared_state.access_list);
|
||||
let opt_resend_buffer = (config.network.resend_buffer_max_len > 0).then_some(Vec::new());
|
||||
|
||||
let mut worker = Self {
|
||||
config,
|
||||
|
|
@ -56,7 +54,6 @@ impl SocketWorker {
|
|||
validator,
|
||||
access_list_cache,
|
||||
socket,
|
||||
opt_resend_buffer,
|
||||
buffer: [0; BUFFER_SIZE],
|
||||
rng: SmallRng::from_entropy(),
|
||||
};
|
||||
|
|
@ -65,6 +62,8 @@ impl SocketWorker {
|
|||
}
|
||||
|
||||
pub fn run_inner(&mut self) -> anyhow::Result<()> {
|
||||
let mut opt_resend_buffer =
|
||||
(self.config.network.resend_buffer_max_len > 0).then_some(Vec::new());
|
||||
let mut events = Events::with_capacity(1);
|
||||
let mut poll = Poll::new().context("create poll")?;
|
||||
|
||||
|
|
@ -79,28 +78,23 @@ impl SocketWorker {
|
|||
|
||||
for event in events.iter() {
|
||||
if event.is_readable() {
|
||||
self.read_and_handle_requests();
|
||||
self.read_and_handle_requests(&mut opt_resend_buffer);
|
||||
}
|
||||
}
|
||||
|
||||
// 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) = opt_resend_buffer.as_mut() {
|
||||
for (addr, response) in resend_buffer.drain(..) {
|
||||
send_response(
|
||||
&self.config,
|
||||
&self.statistics,
|
||||
&mut self.socket,
|
||||
&mut self.buffer,
|
||||
&mut None,
|
||||
response,
|
||||
addr,
|
||||
);
|
||||
self.send_response(&mut None, addr, response);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn read_and_handle_requests(&mut self) {
|
||||
fn read_and_handle_requests(
|
||||
&mut self,
|
||||
opt_resend_buffer: &mut Option<Vec<(CanonicalSocketAddr, Response)>>,
|
||||
) {
|
||||
let max_scrape_torrents = self.config.protocol.max_scrape_torrents;
|
||||
|
||||
loop {
|
||||
|
|
@ -144,7 +138,9 @@ impl SocketWorker {
|
|||
statistics.requests.fetch_add(1, Ordering::Relaxed);
|
||||
}
|
||||
|
||||
self.handle_request(request, src);
|
||||
if let Some(response) = self.handle_request(request, src) {
|
||||
self.send_response(opt_resend_buffer, src, response);
|
||||
}
|
||||
}
|
||||
Err(RequestParseError::Sendable {
|
||||
connection_id,
|
||||
|
|
@ -156,15 +152,7 @@ impl SocketWorker {
|
|||
message: err.into(),
|
||||
};
|
||||
|
||||
send_response(
|
||||
&self.config,
|
||||
&self.statistics,
|
||||
&mut self.socket,
|
||||
&mut self.buffer,
|
||||
&mut self.opt_resend_buffer,
|
||||
Response::Error(response),
|
||||
src,
|
||||
);
|
||||
self.send_response(opt_resend_buffer, src, Response::Error(response));
|
||||
|
||||
::log::debug!("request parse error (sent error response): {:?}", err);
|
||||
}
|
||||
|
|
@ -186,25 +174,15 @@ impl SocketWorker {
|
|||
}
|
||||
}
|
||||
|
||||
fn handle_request(&mut self, request: Request, src: CanonicalSocketAddr) {
|
||||
fn handle_request(&mut self, request: Request, src: CanonicalSocketAddr) -> Option<Response> {
|
||||
let access_list_mode = self.config.access_list.mode;
|
||||
|
||||
match request {
|
||||
Request::Connect(request) => {
|
||||
let response = ConnectResponse {
|
||||
return Some(Response::Connect(ConnectResponse {
|
||||
connection_id: self.validator.create_connection_id(src),
|
||||
transaction_id: request.transaction_id,
|
||||
};
|
||||
|
||||
send_response(
|
||||
&self.config,
|
||||
&self.statistics,
|
||||
&mut self.socket,
|
||||
&mut self.buffer,
|
||||
&mut self.opt_resend_buffer,
|
||||
Response::Connect(response),
|
||||
src,
|
||||
);
|
||||
}));
|
||||
}
|
||||
Request::Announce(request) => {
|
||||
if self
|
||||
|
|
@ -230,30 +208,12 @@ impl SocketWorker {
|
|||
peer_valid_until,
|
||||
);
|
||||
|
||||
send_response(
|
||||
&self.config,
|
||||
&self.statistics,
|
||||
&mut self.socket,
|
||||
&mut self.buffer,
|
||||
&mut self.opt_resend_buffer,
|
||||
response,
|
||||
src,
|
||||
);
|
||||
return Some(response);
|
||||
} else {
|
||||
let response = ErrorResponse {
|
||||
return Some(Response::Error(ErrorResponse {
|
||||
transaction_id: request.transaction_id,
|
||||
message: "Info hash not allowed".into(),
|
||||
};
|
||||
|
||||
send_response(
|
||||
&self.config,
|
||||
&self.statistics,
|
||||
&mut self.socket,
|
||||
&mut self.buffer,
|
||||
&mut self.opt_resend_buffer,
|
||||
Response::Error(response),
|
||||
src,
|
||||
);
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -262,33 +222,23 @@ impl SocketWorker {
|
|||
.validator
|
||||
.connection_id_valid(src, request.connection_id)
|
||||
{
|
||||
let response = self.shared_state.torrent_maps.scrape(request, src);
|
||||
return Some(Response::Scrape(
|
||||
self.shared_state.torrent_maps.scrape(request, src),
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
send_response(
|
||||
&self.config,
|
||||
&self.statistics,
|
||||
&mut self.socket,
|
||||
&mut self.buffer,
|
||||
&mut self.opt_resend_buffer,
|
||||
Response::Scrape(response),
|
||||
src,
|
||||
);
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn send_response(
|
||||
config: &Config,
|
||||
statistics: &CachePaddedArc<IpVersionStatistics<SocketWorkerStatistics>>,
|
||||
socket: &mut UdpSocket,
|
||||
buffer: &mut [u8],
|
||||
fn send_response(
|
||||
&mut self,
|
||||
opt_resend_buffer: &mut Option<Vec<(CanonicalSocketAddr, Response)>>,
|
||||
response: Response,
|
||||
canonical_addr: CanonicalSocketAddr,
|
||||
) {
|
||||
let mut buffer = Cursor::new(&mut buffer[..]);
|
||||
response: Response,
|
||||
) {
|
||||
let mut buffer = Cursor::new(&mut self.buffer[..]);
|
||||
|
||||
if let Err(err) = response.write_bytes(&mut buffer) {
|
||||
::log::error!("failed writing response to buffer: {:#}", err);
|
||||
|
|
@ -298,7 +248,7 @@ fn send_response(
|
|||
|
||||
let bytes_written = buffer.position() as usize;
|
||||
|
||||
let addr = if config.network.address.is_ipv4() {
|
||||
let addr = if self.config.network.address.is_ipv4() {
|
||||
canonical_addr
|
||||
.get_ipv4()
|
||||
.expect("found peer ipv6 address while running bound to ipv4 address")
|
||||
|
|
@ -306,22 +256,25 @@ fn send_response(
|
|||
canonical_addr.get_ipv6_mapped()
|
||||
};
|
||||
|
||||
match socket.send_to(&buffer.into_inner()[..bytes_written], addr) {
|
||||
Ok(amt) if config.statistics.active() => {
|
||||
match self
|
||||
.socket
|
||||
.send_to(&buffer.into_inner()[..bytes_written], addr)
|
||||
{
|
||||
Ok(bytes_sent) if self.config.statistics.active() => {
|
||||
let stats = if canonical_addr.is_ipv4() {
|
||||
let stats = &statistics.ipv4;
|
||||
let stats = &self.statistics.ipv4;
|
||||
|
||||
stats
|
||||
.bytes_sent
|
||||
.fetch_add(amt + EXTRA_PACKET_SIZE_IPV4, Ordering::Relaxed);
|
||||
.fetch_add(bytes_sent + EXTRA_PACKET_SIZE_IPV4, Ordering::Relaxed);
|
||||
|
||||
stats
|
||||
} else {
|
||||
let stats = &statistics.ipv6;
|
||||
let stats = &self.statistics.ipv6;
|
||||
|
||||
stats
|
||||
.bytes_sent
|
||||
.fetch_add(amt + EXTRA_PACKET_SIZE_IPV6, Ordering::Relaxed);
|
||||
.fetch_add(bytes_sent + EXTRA_PACKET_SIZE_IPV6, Ordering::Relaxed);
|
||||
|
||||
stats
|
||||
};
|
||||
|
|
@ -342,13 +295,12 @@ fn send_response(
|
|||
}
|
||||
}
|
||||
Ok(_) => (),
|
||||
Err(err) => {
|
||||
match opt_resend_buffer.as_mut() {
|
||||
Err(err) => match opt_resend_buffer.as_mut() {
|
||||
Some(resend_buffer)
|
||||
if (err.raw_os_error() == Some(libc::ENOBUFS))
|
||||
|| (err.kind() == ErrorKind::WouldBlock) =>
|
||||
{
|
||||
if resend_buffer.len() < config.network.resend_buffer_max_len {
|
||||
if resend_buffer.len() < self.config.network.resend_buffer_max_len {
|
||||
::log::debug!("Adding response to resend queue, since sending it to {} failed with: {:#}", addr, err);
|
||||
|
||||
resend_buffer.push((canonical_addr, response));
|
||||
|
|
@ -359,9 +311,9 @@ fn send_response(
|
|||
_ => {
|
||||
::log::warn!("Sending response to {} failed: {:#}", addr, err);
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
::log::debug!("send response fn finished");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue