Close connection when handshake timeout occurs

Fixes #483

Author: jkralik

conn.go

@@ -896,6 +896,10 @@ func (c *Conn) handshake(ctx context.Context, cfg *handshakeConfig, initialFligh
 						_ = c.close(false) //nolint:contextcheck
 					}
 				}
+				if !c.isConnectionClosed() && errors.Is(err, context.Canceled) {
+					c.log.Trace("handshake timeouts - closing underline connection")
+					_ = c.close(false) //nolint:contextcheck
+				}
 				return
 			}
 		}
@@ -905,10 +909,12 @@ func (c *Conn) handshake(ctx context.Context, cfg *handshakeConfig, initialFligh
 	case err := <-firstErr:
 		cancelRead()
 		cancel()
+		c.handshakeLoopsFinished.Wait()
 		return c.translateHandshakeCtxError(err)
 	case <-ctx.Done():
 		cancelRead()
 		cancel()
+		c.handshakeLoopsFinished.Wait()
 		return c.translateHandshakeCtxError(ctx.Err())
 	case <-done:
 		return nil
@@ -941,13 +947,18 @@ func (c *Conn) close(byUser bool) error {
 	if byUser {
 		c.connectionClosedByUser = true
 	}
+	isClosed := c.isConnectionClosed()
 	c.closed.Close()
 	c.closeLock.Unlock()
 
 	if closedByUser {
 		return ErrConnClosed
 	}
 
+	if isClosed {
+		return nil
+	}
+
 	return c.nextConn.Close()
 }
 

conn_test.go

@@ -274,6 +274,7 @@ func pipeConn(ca, cb net.Conn) (*Conn, *Conn, error) {
 	// Receive client
 	res := <-c
 	if res.err != nil {
+		_ = server.Close()
 		return nil, nil, res.err
 	}
 
@@ -1349,6 +1350,7 @@ func TestCipherSuiteConfiguration(t *testing.T) {
 			res := <-c
 			if res.err == nil {
 				_ = server.Close()
+				_ = res.c.Close()
 			}
 			if !errors.Is(res.err, test.WantClientError) {
 				t.Errorf("TestSRTPConfiguration: Client Error Mismatch '%s': expected(%v) actual(%v)", test.Name, test.WantClientError, res.err)
@@ -1423,6 +1425,7 @@ func TestCertificateAndPSKServer(t *testing.T) {
 			res := <-c
 			if res.err == nil {
 				_ = server.Close()
+				_ = res.c.Close()
 			} else {
 				t.Errorf("TestCertificateAndPSKServer: Client Error Mismatch '%s': expected(%v) actual(%v)", test.Name, nil, res.err)
 			}