Add conn closed error to prevent closed conn hanging forever

Signed-off-by: Yilun <[email protected]>
nknorg · Aug 3, 2020 · 2967b14 · 2967b14
1 parent 711a2d0
commit 2967b14
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/connection.go b/connection.go
@@ -159,6 +159,9 @@ func (conn *Connection) tx() error {
 			if conn.session.IsClosed() {
 				return ErrSessionClosed
 			}
+			if err == ErrConnClosed {
+				return err
+			}
 			log.Println(err)
 			select {
 			case conn.session.resendChan <- seq:
@@ -234,6 +237,9 @@ func (conn *Connection) sendAck() error {
 
 		err = conn.session.sendWith(conn.localClientID, conn.remoteClientID, buf, conn.retransmissionTimeout)
 		if err != nil {
+			if err == ErrConnClosed {
+				return err
+			}
 			log.Println(err)
 			time.Sleep(time.Second)
 			continue

diff --git a/errors.go b/errors.go
@@ -11,6 +11,7 @@ var (
 	ErrInvalidPacket         = NewGenericError("invalid packet", false, true)
 	ErrRecvWindowFull        = NewGenericError("receive window full", false, true)
 	ErrNotHandshake          = NewGenericError("first packet is not handshake packet", false, true)
+	ErrConnClosed            = NewGenericError("connection closed", false, false)
 )
 
 type GenericError struct {