use the QUICConn.NextEvent API

Author: marten-seemann

internal/handshake/crypto_setup.go

@@ -201,7 +201,7 @@ func (h *cryptoSetup) SetLargest1RTTAcked(pn protocol.PacketNumber) error {
 }
 
 func (h *cryptoSetup) StartHandshake() error {
-	events, err := h.conn.Start(context.WithValue(context.Background(), QUICVersionContextKey, h.version))
+	err := h.conn.Start(context.WithValue(context.Background(), QUICVersionContextKey, h.version))
 	if h.perspective == protocol.PerspectiveClient {
 		if false && h.zeroRTTSealer != nil && h.zeroRTTParameters != nil {
 			h.logger.Debugf("Doing 0-RTT.")
@@ -214,8 +214,16 @@ func (h *cryptoSetup) StartHandshake() error {
 	if err != nil {
 		return err
 	}
-	_, err = h.handleEvents(events)
-	return err
+	for {
+		ev := h.conn.NextEvent()
+		if ev.Kind == tls.QUICNoEvent {
+			break
+		}
+		if err := h.handleEvent(ev); err != nil {
+			return err
+		}
+	}
+	return nil
 }
 
 func (h *cryptoSetup) onError(alert uint8, message string) {
@@ -235,45 +243,41 @@ func (h *cryptoSetup) Close() error { return h.conn.Close() }
 // HandleMessage handles a TLS handshake message.
 // It is called by the crypto streams when a new message is available.
 func (h *cryptoSetup) HandleMessage(data []byte, encLevel protocol.EncryptionLevel) {
-	events, err := h.conn.HandleData(encLevel.ToTLSEncryptionLevel(), data)
-	if err != nil {
-		h.onError(0, err.Error())
-	}
-	retry, err := h.handleEvents(events)
-	if err != nil {
+	if err := h.conn.HandleData(encLevel.ToTLSEncryptionLevel(), data); err != nil {
 		h.onError(0, err.Error())
 	}
-	if retry {
-		h.HandleMessage(nil, protocol.EncryptionHandshake)
+	for {
+		ev := h.conn.NextEvent()
+		if ev.Kind == tls.QUICNoEvent {
+			break
+		}
+		if err := h.handleEvent(ev); err != nil {
+			h.onError(0, err.Error())
+		}
 	}
 }
 
-func (h *cryptoSetup) handleEvents(events []tls.QUICEvent) (bool, error) {
-	var retry bool
-	for _, ev := range events {
-		var err error
-		switch ev.Kind {
-		case tls.QUICSetReadSecret:
-			h.SetReadKey(ev.Level, ev.Suite, ev.Data)
-		case tls.QUICSetWriteSecret:
-			h.SetWriteKey(ev.Level, ev.Suite, ev.Data)
-		case tls.QUICTransportParameters:
-			err = h.handleTransportParameters(ev.Data)
-		case tls.QUICTransportParametersRequired:
-			h.conn.SetTransportParameters(h.ourParams.Marshal(h.perspective))
-			retry = true
-		case tls.QUICWriteData:
-			err = h.WriteRecord(ev.Level, ev.Data)
-		case tls.QUICHandshakeDone:
-			h.handshakeComplete()
-		default:
-			return false, fmt.Errorf("unexpected event: %d", ev.Kind)
-		}
-		if err != nil {
-			return false, err
-		}
+func (h *cryptoSetup) handleEvent(ev tls.QUICEvent) error {
+	switch ev.Kind {
+	case tls.QUICSetReadSecret:
+		h.SetReadKey(ev.Level, ev.Suite, ev.Data)
+		return nil
+	case tls.QUICSetWriteSecret:
+		h.SetWriteKey(ev.Level, ev.Suite, ev.Data)
+		return nil
+	case tls.QUICTransportParameters:
+		return h.handleTransportParameters(ev.Data)
+	case tls.QUICTransportParametersRequired:
+		h.conn.SetTransportParameters(h.ourParams.Marshal(h.perspective))
+		return nil
+	case tls.QUICWriteData:
+		return h.WriteRecord(ev.Level, ev.Data)
+	case tls.QUICHandshakeDone:
+		h.handshakeComplete()
+		return nil
+	default:
+		return fmt.Errorf("unexpected event: %d", ev.Kind)
 	}
-	return retry, nil
 }
 
 func (h *cryptoSetup) handleTransportParameters(data []byte) error {