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

Better io error handling (#482)

Browse source
This commit is contained in:
Nikolay Kim 2024-12-05 14:02:59 +05:00 • committed by GitHub
parent 2631e70a4b
commit 22ee7f2af2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 63 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ntex-tls/src/openssl/connect.rs
View file

@ -51,11 +51,11 @@ impl<T: Address> SslConnector<T> {
log::trace!("{}: SSL Handshake start for: {:?}", io.tag(), host);
match openssl.configure() {
Err(e) => Err(io::Error::new(io::ErrorKind::Other, e).into()),
Err(e) => Err(io::Error::new(io::ErrorKind::InvalidInput, e).into()),
Ok(config) => {
let ssl = config
.into_ssl(&host)
.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
.map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
let tag = io.tag();
match connect_io(io, ssl).await {
Ok(io) => {
@ -64,7 +64,10 @@ impl<T: Address> SslConnector<T> {
}
Err(e) => {
log::trace!("{}: SSL Handshake error: {:?}", tag, e);
Err(io::Error::new(io::ErrorKind::Other, format!("{}", e)).into())
Err(
io::Error::new(io::ErrorKind::InvalidInput, format!("{}", e))
.into(),
)
}
}
}

4
ntex-tls/src/openssl/mod.rs
View file

@ -250,7 +250,9 @@ async fn handle_result<T, F>(
ssl::ErrorCode::WANT_READ => {
let res = io.read_notify().await;
match res? {
None => Err(io::Error::new(io::ErrorKind::Other, "disconnected")),
None => {
Err(io::Error::new(io::ErrorKind::NotConnected, "disconnected"))
}
_ => Ok(None),
}
}