colin/hickory-dns
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Break when socket is unexpectedly shut down

Browse Source
This commit is contained in:
David Lönnhager 2024-03-12 13:30:46 +01:00 committed by Benjamin Fry
parent da41e4ad06
commit d2e64d8d26
1 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
crates/server/src/server/server_future.rs
View File

@ -95,6 +95,9 @@ impl<T: RequestHandler> ServerFuture<T> {
let message = match message { let message = match message {
Err(e) => { Err(e) => {
warn!("error receiving message on udp_socket: {}", e); warn!("error receiving message on udp_socket: {}", e);
if is_unrecoverable_socket_error(&e) {
break;
}
continue; continue;
} }
Ok(message) => message, Ok(message) => message,
@ -169,6 +172,9 @@ impl<T: RequestHandler> ServerFuture<T> {
Ok((t, s)) => (t, s), Ok((t, s)) => (t, s),
Err(e) => { Err(e) => {
debug!("error receiving TCP tcp_stream error: {}", e); debug!("error receiving TCP tcp_stream error: {}", e);
if is_unrecoverable_socket_error(&e) {
break;
}
continue; continue;
}, },
}, },
@ -227,7 +233,11 @@ impl<T: RequestHandler> ServerFuture<T> {
reap_tasks(&mut inner_join_set); reap_tasks(&mut inner_join_set);
} }
Ok(()) if shutdown.is_cancelled() {
Ok(())
} else {
Err(ProtoError::from("unexpected close of socket"))
}
}); });
} }
@ -298,6 +308,9 @@ impl<T: RequestHandler> ServerFuture<T> {
Ok((t, s)) => (t, s), Ok((t, s)) => (t, s),
Err(e) => { Err(e) => {
debug!("error receiving TLS tcp_stream error: {}", e); debug!("error receiving TLS tcp_stream error: {}", e);
if is_unrecoverable_socket_error(&e) {
break;
}
continue; continue;
}, },
}, },
@ -373,7 +386,11 @@ impl<T: RequestHandler> ServerFuture<T> {
reap_tasks(&mut inner_join_set); reap_tasks(&mut inner_join_set);
} }
Ok(()) if shutdown.is_cancelled() {
Ok(())
} else {
Err(ProtoError::from("unexpected close of socket"))
}
}); });
Ok(()) Ok(())
@ -451,6 +468,9 @@ impl<T: RequestHandler> ServerFuture<T> {
Ok((t, s)) => (t, s), Ok((t, s)) => (t, s),
Err(e) => { Err(e) => {
debug!("error receiving TLS tcp_stream error: {}", e); debug!("error receiving TLS tcp_stream error: {}", e);
if is_unrecoverable_socket_error(&e) {
break;
}
continue; continue;
}, },
}, },
@ -519,7 +539,11 @@ impl<T: RequestHandler> ServerFuture<T> {
reap_tasks(&mut inner_join_set); reap_tasks(&mut inner_join_set);
} }
Ok(()) if shutdown.is_cancelled() {
Ok(())
} else {
Err(ProtoError::from("unexpected close of socket"))
}
}); });
Ok(()) Ok(())
@ -646,6 +670,9 @@ impl<T: RequestHandler> ServerFuture<T> {
Ok((t, s)) => (t, s), Ok((t, s)) => (t, s),
Err(e) => { Err(e) => {
debug!("error receiving HTTPS tcp_stream error: {}", e); debug!("error receiving HTTPS tcp_stream error: {}", e);
if is_unrecoverable_socket_error(&e) {
break;
}
continue; continue;
}, },
}, },
@ -696,7 +723,11 @@ impl<T: RequestHandler> ServerFuture<T> {
reap_tasks(&mut inner_join_set); reap_tasks(&mut inner_join_set);
} }
Ok(()) if shutdown.is_cancelled() {
Ok(())
} else {
Err(ProtoError::from("unexpected close of socket"))
}
}); });
Ok(()) Ok(())
@ -1214,6 +1245,13 @@ fn sanitize_src_address(src: SocketAddr) -> Result<(), String> {
} }
} }
fn is_unrecoverable_socket_error(err: &io::Error) -> bool {
matches!(
err.kind(),
io::ErrorKind::NotConnected | io::ErrorKind::ConnectionAborted
)
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;