Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify trillium_server_common::Acceptor to return an Option #376

Closed
wants to merge 1 commit into from
Closed

Modify trillium_server_common::Acceptor to return an Option #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion async-std/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ log = "0.4.19"
trillium = { path = "../trillium", version = "^0.2.0" }
trillium-http = { path = "../http", version = "^0.3.0" }
trillium-macros = { version = "0.0.4", path = "../macros" }
trillium-server-common = { path = "../server-common", version = "^0.4.0" }
trillium-server-common = { path = "../server-common", version = "^0.5.0" }

[target.'cfg(unix)'.dependencies]
signal-hook = "0.3.17"
Expand Down
2 changes: 1 addition & 1 deletion client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ httparse = "1.8.0"
log = "0.4.19"
memmem = "0.1.1"
size = "0.4.1"
trillium-server-common = { version = "0.4.0", path = "../server-common" }
trillium-server-common = { version = "0.5.0", path = "../server-common" }
url = "2.4.0"
mime = "0.3.17"
serde_json = { version = "1.0.104", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions native-tls/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "trillium-native-tls"
version = "0.3.0"
version = "0.4.0"
authors = ["Jacob Rothstein <[email protected]>"]
edition = "2021"
description = "native-tls adapter for trillium.rs"
Expand All @@ -13,7 +13,7 @@ categories = ["web-programming::http-server", "web-programming"]
[dependencies]
async-native-tls = "0.5.0"
native-tls = "0.2.11"
trillium-server-common = { path = "../server-common", version = "^0.4.0" }
trillium-server-common = { path = "../server-common", version = "^0.5.0" }

[dev-dependencies]
env_logger = "0.10.0"
Expand Down
8 changes: 6 additions & 2 deletions native-tls/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@ where
{
type Output = NativeTlsTransport<Input>;
type Error = Error;
async fn accept(&self, input: Input) -> Result<Self::Output, Self::Error> {
self.0.accept(input).await.map(NativeTlsTransport::from)
async fn accept(&self, input: Input) -> Result<Option<Self::Output>, Self::Error> {
self.0
.accept(input)
.await
.map(NativeTlsTransport::from)
.map(Some)
}
}
4 changes: 2 additions & 2 deletions rustls/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "trillium-rustls"
version = "0.4.0"
version = "0.5.0"
authors = ["Jacob Rothstein <[email protected]>"]
edition = "2021"
description = "rustls adapter for trillium.rs"
Expand All @@ -17,7 +17,7 @@ rustls = "0.21.0"
rustls-native-certs = "0.6.2"
rustls-pemfile = "1.0.2"
rustls-webpki = "0.100.1"
trillium-server-common = { path = "../server-common", version = "^0.4.0" }
trillium-server-common = { path = "../server-common", version = "^0.5.0" }
webpki-roots = "0.23"

[dev-dependencies]
Expand Down
8 changes: 6 additions & 2 deletions rustls/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,11 @@ where
{
type Output = RustlsTransport<Input>;
type Error = io::Error;
async fn accept(&self, input: Input) -> Result<Self::Output, Self::Error> {
self.0.accept(input).await.map(RustlsTransport::from)
async fn accept(&self, input: Input) -> Result<Option<Self::Output>, Self::Error> {
self.0
.accept(input)
.await
.map(RustlsTransport::from)
.map(Some)
}
}
2 changes: 1 addition & 1 deletion server-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "trillium-server-common"
version = "0.4.4"
version = "0.5.0"
authors = ["Jacob Rothstein <[email protected]>"]
edition = "2021"
description = "server utilities for trillium.rs"
Expand Down
12 changes: 6 additions & 6 deletions server-common/src/acceptor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ where
{
type Output = my_tls_impl::TlsStream<Input>;
type Error = my_tls_impl::Error;
async fn accept(&self, input: Input) -> Result<Self::Output, Self::Error> {
self.accept(input).await
async fn accept(&self, input: Input) -> Result<Option<Self::Output>, Self::Error> {
self.accept(input).await.map(Some)
}
}
```
Expand All @@ -40,10 +40,10 @@ where

Async trait signature:
```rust,ignore
async fn accept(&self, input: Input) -> Result<Self::Output, Self::Error>;
async fn accept(&self, input: Input) -> Result<Option<Self::Output>, Self::Error>;
```
*/
async fn accept(&self, input: Input) -> Result<Self::Output, Self::Error>;
async fn accept(&self, input: Input) -> Result<Option<Self::Output>, Self::Error>;
}

#[async_trait]
Expand All @@ -53,7 +53,7 @@ where
{
type Output = Input;
type Error = Infallible;
async fn accept(&self, input: Input) -> Result<Self::Output, Self::Error> {
Ok(input)
async fn accept(&self, input: Input) -> Result<Option<Self::Output>, Self::Error> {
Ok(Some(input))
}
}
3 changes: 2 additions & 1 deletion server-common/src/config_ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ where
let peer_ip = stream.peer_addr().ok().flatten().map(|addr| addr.ip());

let stream = match self.acceptor.accept(stream).await {
Ok(stream) => stream,
Ok(Some(stream)) => stream,
Ok(None) => return,
Err(e) => {
joshtriplett marked this conversation as resolved.
Show resolved Hide resolved
log::error!("acceptor error: {:?}", e);
return;
Expand Down
2 changes: 1 addition & 1 deletion smol/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ log = "0.4.19"
trillium = { path = "../trillium", version = "^0.2.0" }
trillium-http = { path = "../http", version = "^0.3.0" }
trillium-macros = { version = "0.0.4", path = "../macros" }
trillium-server-common = { path = "../server-common", version = "^0.4.0" }
trillium-server-common = { path = "../server-common", version = "^0.5.0" }

[target.'cfg(unix)'.dependencies]
signal-hook = "0.3.17"
Expand Down
2 changes: 1 addition & 1 deletion testing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ futures-lite = "1.13.0"
portpicker = "0.1.1"
trillium = { path = "../trillium", version = "^0.2.0" }
trillium-http = { path = "../http", version = "^0.3.0" }
trillium-server-common = { path = "../server-common", version = "^0.4.0" }
trillium-server-common = { path = "../server-common", version = "^0.5.0" }
cfg-if = "1.0.0"
url = "2.4.0"
async-channel = "1.9.0"
Expand Down
2 changes: 1 addition & 1 deletion tokio/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ tokio-stream = { version = "0.1.14", features = ["net"] }
trillium = { path = "../trillium", version = "^0.2.0" }
trillium-http = { path = "../http", version = "^0.3.0" }
trillium-macros = { version = "0.0.4", path = "../macros" }
trillium-server-common = { path = "../server-common", version = "^0.4.0" }
trillium-server-common = { path = "../server-common", version = "^0.5.0" }

[dependencies.tokio]
version = "1.29.1"
Expand Down
Loading