From 93cb25cd54f5b0ff030e58367dbf568a80b6224e Mon Sep 17 00:00:00 2001 From: soruh Date: Sun, 19 Mar 2023 14:45:25 +0100 Subject: [PATCH] only use nc in reject packets if no other message was supplied --- src/client.rs | 12 +++++------- src/main.rs | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/client.rs b/src/client.rs index a67cf0b..1241f23 100644 --- a/src/client.rs +++ b/src/client.rs @@ -180,13 +180,11 @@ pub async fn connection_handler( if matches!(packet.kind(), PacketKind::End | PacketKind::Reject) { info!(?packet, "got disconnect packet"); - if packet.kind() == PacketKind::End { - packet.header.kind = PacketKind::Reject.raw(); - packet.data.clear(); - if packet.data.is_empty() { - packet.data.extend_from_slice(b"nc\0"); - packet.header.length = packet.data.len() as u8; - } + packet.header.kind = PacketKind::Reject.raw(); + + if packet.data.is_empty() { + packet.data.extend_from_slice(b"nc\0"); + packet.header.length = packet.data.len() as u8; } port_handler.lock().await.start_rejector( diff --git a/src/main.rs b/src/main.rs index d882f5f..0d24de1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -172,7 +172,6 @@ fn main() -> anyhow::Result<()> { .with( fmt::layer() .with_target(true) - .with_ansi(true) .with_timer(fmt::time::OffsetTime::new( *TIME_ZONE_OFFSET.get().unwrap(), TIME_FORMAT.get().unwrap(),