fix: TLS1.2 non-block read

panjf2000 · Apr 23, 2024 · 79b2a67 · 79b2a67
1 parent 2900b77
commit 79b2a67
Show file tree

Hide file tree

Showing 9 changed files with 264 additions and 404 deletions.
diff --git a/pkg/tls/conn.go b/pkg/tls/conn.go
@@ -39,6 +39,8 @@ type Conn struct {
 	// isHandshakeComplete is true implies handshakeErr == nil.
 	isHandshakeComplete  atomic.Bool
 	isWaitClientFinished atomic.Bool
+	handshakeState       int8
+	hs                   interface{ handshake() error }
 	readClientFinished   func() error
 	// constant after handshake; protected by handshakeMutex
 	handshakeMutex sync.Mutex
@@ -1583,13 +1585,13 @@ func (c *Conn) handshakeContext(ctx context.Context) (ret error) {
 		return nil
 	}
 
-	if c.isWaitClientFinished.Load() {
+	/*if c.isWaitClientFinished.Load() {
 		if err := c.readClientFinished(); err != nil {
 			return err
 		}
 		c.isHandshakeComplete.Store(true)
 		return nil
-	}
+	}*/
 
 	/*	if c.isHandshakeComplete.Load() {
 		return nil
@@ -1658,8 +1660,8 @@ func (c *Conn) handshakeContext(ctx context.Context) (ret error) {
 		c.flush()
 	}
 
-	if c.isWaitClientFinished.Load() {
-		return ErrNotEnough
+	if !c.isHandshakeComplete.Load() {
+		return nil
 	}
 
 	/*	if c.handshakeErr == nil && !c.isHandshakeComplete.Load() {