Handle connection state more carefully

eycorsican · Aug 9, 2020 · 7ba5098 · 7ba5098
1 parent e85c430
commit 7ba5098
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/tcp_conn.go b/core/tcp_conn.go
@@ -114,6 +114,10 @@ func newTCPConn(pcb *C.struct_tcp_pcb, handler TCPConnHandler) (TCPConn, error)
 			conn.Abort()
 		} else {
 			conn.Lock()
+			if conn.state != tcpConnecting {
+				conn.Unlock()
+				return
+			}
 			conn.state = tcpConnected
 			conn.Unlock()
 
@@ -158,11 +162,11 @@ func (conn *tcpConn) receiveCheck() error {
 	case tcpNewConn:
 		fallthrough
 	case tcpConnecting:
-		fallthrough
+		return NewLWIPError(LWIP_ERR_CONN)
 	case tcpAborting:
 		fallthrough
 	case tcpClosed:
-		return NewLWIPError(LWIP_ERR_CONN)
+		fallthrough
 	case tcpReceiveClosed:
 		fallthrough
 	case tcpClosing: