From 8704b7f6575dd7b75dec2aed5fee28f340e7eb70 Mon Sep 17 00:00:00 2001
From: Kleissner <peter@kleissner.investments>
Date: Sat, 26 Feb 2022 16:29:03 +0100
Subject: [PATCH] UDT: Fix close bug. It kept sending ACKs/NAKs even though the
 underlying socket was already closed. Close #95

---
 udt/udtsocket.go      | 1 +
 udt/udtsocket_recv.go | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/udt/udtsocket.go b/udt/udtsocket.go
index a7a6c52..56a9cb1 100644
--- a/udt/udtsocket.go
+++ b/udt/udtsocket.go
@@ -302,6 +302,7 @@ func (s *udtSocket) Close() error {
 	}
 
 	s.isClosed = true
+	close(s.sockClosed)
 
 	// closing messageOut was a signal supposed to tell the send code to initiate shutdown. However, it closes too fast before all data is transferred.
 	// The entire UDT code is a piece of !@#$ and needs a rewrite.
diff --git a/udt/udtsocket_recv.go b/udt/udtsocket_recv.go
index 96d73e7..551d1e5 100644
--- a/udt/udtsocket_recv.go
+++ b/udt/udtsocket_recv.go
@@ -8,7 +8,6 @@ import (
 
 type udtSocketRecv struct {
 	// channels
-	sockClosed <-chan struct{}      // closed when socket is closed
 	recvEvent  <-chan recvPktEvent  // receiver: ingest the specified packet. Sender is readPacket, receiver is goReceiveEvent
 	messageIn  chan<- []byte        // inbound messages. Sender is goReceiveEvent->ingestData, Receiver is client caller (Read)
 	sendPacket chan<- packet.Packet // send a packet out on the wire
@@ -39,7 +38,6 @@ type udtSocketRecv struct {
 func newUdtSocketRecv(s *udtSocket) *udtSocketRecv {
 	sr := &udtSocketRecv{
 		socket:           s,
-		sockClosed:       s.sockClosed,
 		recvEvent:        s.recvEvent,
 		messageIn:        s.messageIn,
 		sendPacket:       s.sendPacket,
@@ -70,7 +68,6 @@ func (s *udtSocketRecv) goReceiveEvent() {
 	defer s.resendACKTicker.Stop()
 
 	recvEvent := s.recvEvent
-	sockClosed := s.sockClosed
 	for {
 		select {
 		case evt, ok := <-recvEvent:
@@ -87,7 +84,9 @@ func (s *udtSocketRecv) goReceiveEvent() {
 			case *packet.ErrPacket:
 				s.ingestError(sp)
 			}
-		case <-sockClosed: // socket is closed, leave now
+		case <-s.socket.sockClosed: // socket is closed, leave now
+			return
+		case <-s.socket.terminateSignal:
 			return
 		case <-s.resendACKTimer: // handles both resending ACKs and NAKs
 			if s.recvAck2.IsLess(s.sentAck) && s.resendACKLimiter.Allow() {