From f0de6b441ed0d979bd6becbbd233da146c86f815 Mon Sep 17 00:00:00 2001
From: neuronori <sexygirl31337@gmail.com>
Date: Sat, 20 Jun 2026 07:52:18 +0000
Subject: [PATCH] fix(vp8channel): preserve control epoch across
 reconnect/reset

Control KCP epoch must stay stable across both carrier reconnects and
liveness resets to avoid breaking ping/pong routing. Previously:

- SetReconnectCallback rotated control epoch (fix: preserve)
- ResetPeer also rotated control epoch (fix: preserve)

Both now snapshot the control epoch header before data epoch rotation
and use restartControlKCPWithHeader() with the preserved epoch.

This prevents control frames from using a mismatched epoch after
liveness timeout or carrier reconnect, which broke routing and caused
reconnect loops.
---
 internal/transport/vp8channel/transport.go | 36 ++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/internal/transport/vp8channel/transport.go b/internal/transport/vp8channel/transport.go
index efe90b8..09e57bc 100644
--- a/internal/transport/vp8channel/transport.go
+++ b/internal/transport/vp8channel/transport.go
@@ -531,8 +531,11 @@ func (p *streamTransport) drainControlOutbound() {
 func (p *streamTransport) ResetPeer() {
 	p.peerConfirmed.Store(false)
 	p.peerEpoch.Store(0)
+	// Preserve control epoch across reset to avoid breaking ping/pong routing.
+	// Control frames use a separate epoch path and must stay stable.
+	controlHdr := p.controlEpochHeader()
 	p.restartKCP(p.rotateEpochHeader())
-	p.restartControlKCP()
+	p.restartControlKCPWithHeader(controlHdr)
 }
 
 // Reconnect forwards to the underlying engine session.
@@ -553,8 +556,9 @@ func (p *streamTransport) SetReconnectCallback(cb func()) {
 		// need a new handshake and liveness does not time out.
 		p.peerConfirmed.Store(false)
 		p.peerEpoch.Store(0)
+		controlHdr := p.controlEpochHeader() // snapshot BEFORE data epoch rotation
 		p.restartKCP(p.rotateEpochHeader())
-		p.restartControlKCP()
+		p.restartControlKCPWithHeader(controlHdr)
 		if cb != nil {
 			cb()
 		}
@@ -803,6 +807,34 @@ func (p *streamTransport) restartControlKCP() {
 	p.controlKCPMu.Unlock()
 }
 
+// restartControlKCPWithHeader restarts the control KCP with a specific epoch header,
+// used to preserve the control epoch across carrier reconnects.
+func (p *streamTransport) restartControlKCPWithHeader(hdr [epochHdrLen]byte) {
+	p.drainControlOutbound()
+	p.controlKCPMu.Lock()
+	old := p.controlKCP
+	p.controlKCP = nil
+	p.controlKCPMu.Unlock()
+	if old != nil {
+		old.close()
+	}
+	controlCb := func(data []byte) {
+		p.controlOnDataMu.RLock()
+		cb := p.onControlData
+		p.controlOnDataMu.RUnlock()
+		if cb != nil {
+			cb(data)
+		}
+	}
+	rt, err := startKCP(p.controlOutbound, controlCb, hdr)
+	if err != nil {
+		return
+	}
+	p.controlKCPMu.Lock()
+	p.controlKCP = rt
+	p.controlKCPMu.Unlock()
+}
+
 func (p *streamTransport) handleRemoteTrack(track *webrtc.TrackRemote, _ *webrtc.RTPReceiver) {
 	if track.Codec().MimeType != webrtc.MimeTypeVP8 {
 		go p.drainTrack(track)