From 589560ae3a7ae7a46f4cdfe814393bda261fa53f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Fri, 11 Jun 2021 18:30:16 +0200
Subject: disconnectedreason::user

---
 mumd/src/network/tcp.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'mumd/src')

diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs
index d7b7c0d..cac1533 100644
--- a/mumd/src/network/tcp.rs
+++ b/mumd/src/network/tcp.rs
@@ -37,7 +37,8 @@ pub(crate) type TcpEventSubscriber = Box<dyn FnMut(TcpEventData) -> bool>; //the
 #[derive(Debug, Clone, Copy, Hash, Eq, PartialEq)]
 pub enum DisconnectedReason {
     InvalidTls,
-    Other,
+    User,
+    TcpError,
 }
 
 /// Something a callback can register to. Data is sent via a respective [TcpEventData].
@@ -195,7 +196,7 @@ pub async fn handle(
 
         let phase_watcher_inner = phase_watcher.clone();
 
-        run_until(
+        let result = run_until(
             |phase| matches!(phase, StatePhase::Disconnected),
             async {
                 select! {
@@ -217,9 +218,12 @@ pub async fn handle(
             phase_watcher,
         )
         .await
-        .unwrap_or(Ok(()))?;
+        .unwrap_or(Ok(()));
 
-        event_queue.resolve(TcpEventData::Disconnected(DisconnectedReason::Other));
+        match result {
+            Ok(()) => event_queue.resolve(TcpEventData::Disconnected(DisconnectedReason::User)),
+            Err(_) => event_queue.resolve(TcpEventData::Disconnected(DisconnectedReason::TcpError)),
+        }
 
         debug!("Fully disconnected TCP stream, waiting for new connection info");
     }
-- 
cgit v1.2.1