Differentiate between timeouts and disconnects

5 files changed, 24 insertions, 8 deletions

diff --git a/client_conn.go b/client_conn.go
index 4be45ba..d665cc5 100644
--- a/client_conn.go
+++ b/client_conn.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/HimbeerserverDE/srp"
 	"github.com/anon55555/mt"
+	"github.com/anon55555/mt/rudp"
 )
 
 type clientState uint8
@@ -63,7 +64,12 @@ func handleClt(cc *clientConn) {
 		pkt, err := cc.Recv()
 		if err != nil {
 			if errors.Is(err, net.ErrClosed) {
-				cc.log("<->", "disconnect")
+				if errors.Is(cc.WhyClosed(), rudp.ErrTimedOut) {
+					cc.log("<->", "timeout")
+				} else {
+					cc.log("<->", "disconnect")
+				}
+
 				if cc.name != "" {
 					playersMu.Lock()
 					delete(players, cc.name)
diff --git a/connect.go b/connect.go
index 7ecf30a..4be538a 100644
--- a/connect.go
+++ b/connect.go
@@ -6,10 +6,13 @@ import (
 	"github.com/anon55555/mt"
 )
 
-func connect(conn net.Conn) *serverConn {
+func connect(conn net.Conn, cc *clientConn) *serverConn {
 	sc := &serverConn{
 		Peer: mt.Connect(conn),
+		clt:  cc,
 	}
+	sc.log("-->", "connect")
+	cc.srv = sc
 
 	go handleSrv(sc)
 	return sc
diff --git a/content.go b/content.go
index fe22407..6cfb958 100644
--- a/content.go
+++ b/content.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/HimbeerserverDE/srp"
 	"github.com/anon55555/mt"
+	"github.com/anon55555/mt/rudp"
 )
 
 type mediaFile struct {
@@ -63,7 +64,11 @@ func handleContent(cc *contentConn) {
 		pkt, err := cc.Recv()
 		if err != nil {
 			if errors.Is(err, net.ErrClosed) {
-				cc.log("<->", "disconnect")
+				if errors.Is(cc.WhyClosed(), rudp.ErrTimedOut) {
+					cc.log("<->", "timeout")
+				} else {
+					cc.log("<->", "disconnect")
+				}
 				break
 			}
 
diff --git a/main.go b/main.go
index 5706830..b2bf21c 100644
--- a/main.go
+++ b/main.go
@@ -123,10 +123,7 @@ func main() {
 				return
 			}
 
-			sc := connect(conn)
-			sc.clt = cc
-			cc.srv = sc
-			sc.log("-->", "connect")
+			connect(conn, cc)
 		}()
 	}
 }
diff --git a/server_conn.go b/server_conn.go
index 5b74b5d..5cd58bf 100644
--- a/server_conn.go
+++ b/server_conn.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/HimbeerserverDE/srp"
 	"github.com/anon55555/mt"
+	"github.com/anon55555/mt/rudp"
 )
 
 type serverConn struct {
@@ -54,7 +55,11 @@ func handleSrv(sc *serverConn) {
 		pkt, err := sc.Recv()
 		if err != nil {
 			if errors.Is(err, net.ErrClosed) {
-				sc.log("<->", "disconnect")
+				if errors.Is(sc.WhyClosed(), rudp.ErrTimedOut) {
+					sc.log("<->", "timeout")
+				} else {
+					sc.log("<->", "disconnect")
+				}
 				break
 			}