GitHub/olcrtc
1
0
Fork 0
mirror of https://github.com/openlibrecommunity/olcrtc.git synced 2026-05-26 07:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(jitsi): reset peer epoch before reconnect announce

Browse Source
This commit is contained in:
zarazaex69
2026-05-16 19:09:29 +03:00
parent 032151be98
commit cae76a6c34
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/engine/jitsi/jitsi.go
View File

@@ -1003,6 +1003,7 @@ func (s *Session) reconnect(ctx context.Context) error {
_ = oldPC.Close()
}
s.localEpoch.Store(randomEpoch())
s.peerEpoch.Store(0)
s.drainSendQueue()
logger.Infof("jitsi: reconnecting %s/%s as %s ...", s.host, s.room, s.name)
@@ -1014,13 +1015,14 @@ func (s *Session) reconnect(ctx context.Context) error {
s.peerEndpoint.Store(nil)
s.peerVideoSSRC.Store(0)
s.bridgeReady.Store(true)
if err := s.Send(nil); err != nil {
logger.Debugf("jitsi: epoch announce failed: %v", err)
}
s.wg.Add(1)
go s.recvLoop()
if err := s.Send(nil); err != nil {
logger.Debugf("jitsi: epoch announce failed: %v", err)
}
if s.onReconnect != nil {
s.onReconnect(nil)
}

23
internal/engine/jitsi/jitsi_test.go
View File

@@ -213,6 +213,29 @@ func TestDeliverBridgeMessageDropsStalePeerEpoch(t *testing.T) {
}
}
func TestReconnectEpochAnnounceWithZeroPeerEpochIsAccepted(t *testing.T) {
sess, err := New(context.Background(), engine.Config{
URL: testHost,
Extra: map[string]string{credentialKeyRoom: testRoom},
})
if err != nil {
t.Fatalf("New: %v", err)
}
defer func() { _ = sess.Close() }()
js, ok := sess.(*Session)
if !ok {
t.Fatal("sess is not *Session")
}
js.localEpoch.Store(0x2222)
announce := makeBridgeFrameForEpoch(t, 0x1111, 0, nil)
js.deliverBridgeMessage(makeBridgeMessageFrom("peerA", map[string]any{rawFieldKey: announce}), true)
if got := js.peerEpoch.Load(); got != 0x1111 {
t.Fatalf("peerEpoch = 0x%08x, want announce epoch", got)
}
}
func TestDeliverBridgeMessagePeerEpochChangeRequestsReconnect(t *testing.T) {
sess, err := New(context.Background(), engine.Config{
URL: testHost,