mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-03 21:07:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove Control::Connection

Browse source
This commit is contained in:
Nikolay Kim 2024-02-07 06:58:39 -06:00
parent a8447b1f6d
commit 68e158d877
2 changed files with 3 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

40
ntex/src/http/h1/control.rs
View file

@ -2,11 +2,9 @@ use std::{future::Future, io};
use crate::http::message::CurrentIo;
use crate::http::{body::Body, h1::Codec, Request, Response, ResponseError};
use crate::io::{Filter, Io, IoBoxed, IoRef};
use crate::io::{Filter, Io, IoBoxed};
pub enum Control<F, Err> {
/// New connection
NewConnection(Connection),
/// New request is loaded
NewRequest(NewRequest),
/// Handle `Connection: UPGRADE`
@ -74,10 +72,6 @@ impl<F, Err> Control<F, Err> {
Control::NewRequest(NewRequest(req))
}
pub(super) fn con(io: IoRef) -> Self {
Control::NewConnection(Connection { io })
}
pub(super) fn upgrade(req: Request, io: Io<F>, codec: Codec) -> Self {
Control::Upgrade(Upgrade { req, io, codec })
}
@ -102,7 +96,6 @@ impl<F, Err> Control<F, Err> {
Err: ResponseError,
{
match self {
Control::NewConnection(msg) => msg.ack(),
Control::NewRequest(msg) => msg.ack(),
Control::Upgrade(msg) => msg.ack(),
Control::Expect(msg) => msg.ack(),
@ -114,37 +107,6 @@ impl<F, Err> Control<F, Err> {
}
}
#[derive(Debug)]
pub struct Connection {
io: IoRef,
}
impl Connection {
#[inline]
/// Returns reference to Io
pub fn io(&self) -> &IoRef {
&self.io
}
#[inline]
/// Ack and continue handling process
pub fn ack(self) -> ControlAck {
ControlAck {
result: ControlResult::Stop,
flags: ControlFlags::empty(),
}
}
#[inline]
/// Drop connection
pub fn disconnect(self) -> ControlAck {
ControlAck {
result: ControlResult::Stop,
flags: ControlFlags::DISCONNECT,
}
}
}
#[derive(Debug)]
pub struct NewRequest(Request);

15
ntex/src/http/h1/service.rs
View file

@ -255,19 +255,8 @@ where
io.query::<types::PeerAddr>().get()
);
let ack = self
.config
.control
.call_nowait(Control::con(io.get_ref()))
Dispatcher::new(io, self.config.clone())
.await
.map_err(|e| DispatchError::Control(e.into()))?;
if ack.flags.contains(super::control::ControlFlags::DISCONNECT) {
Ok(())
} else {
Dispatcher::new(io, self.config.clone())
.await
.map_err(DispatchError::Control)
}
.map_err(DispatchError::Control)
}
}