tamipes/mc-ingress
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

feat: add an Error type to Packet::parse

Browse source 
instead of error logging manually inside `parse`,
return a Result with a custom enum
This commit is contained in:
Tamipes 2025-12-03 22:58:21 +01:00
parent 92dfbd490c
commit 4cf3d5aea0
5 changed files with 69 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main.rs
View file

@ -1,7 +1,6 @@
use std::{net::SocketAddr, sync::Arc};
use futures::TryFutureExt;
use tokio::io::AsyncWriteExt;
use tokio::net::{TcpListener, TcpStream};
use tokio::sync::Mutex;
use tracing_subscriber::{prelude::*, EnvFilter};
@ -73,14 +72,7 @@ async fn process_connection(
addr: SocketAddr,
cache: Arc<Mutex<kube_cache::Cache>>,
) -> Result<(), OpaqueError> {
let client_packet = match Packet::parse(&mut client_stream).await {
Some(x) => x,
None => {
// This is debug, because Packet::parse has all error cases logged with tracing::error
tracing::debug!("Client HANDSHAKE -> malformed packet; Disconnecting...");
return Ok(());
}
};
let client_packet = Packet::parse(&mut client_stream).await?;
// --- Handshake ---
let handshake;
@ -127,9 +119,7 @@ async fn handle_status(
kube_server: KubeServer,
) -> Result<(), OpaqueError> {
tracing::debug!(handshake = ?handshake);
let client_packet = Packet::parse(client_stream)
.await
.ok_or_else(|| "could not parse client_packet".to_string())?;
let client_packet = Packet::parse(client_stream).await?;
if client_packet.id.get_int() != 0 {
return Err(OpaqueError::create(&format!(
"Client STATUS: {:#x} Unknown Id -> Shutdown",