From 3e2482fa59c466b9611416ade3693cc15a3281c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Ma=C5=82ecki?= Date: Tue, 22 Nov 2022 14:40:56 +0100 Subject: [PATCH 1/2] Fix: rendezvous: do not reject incoming packet with id=0 when rendezvous --- srtcore/queue.cpp | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/srtcore/queue.cpp b/srtcore/queue.cpp index 8d6727268..6d49edcea 100644 --- a/srtcore/queue.cpp +++ b/srtcore/queue.cpp @@ -897,10 +897,26 @@ void srt::CRendezvousQueue::updateConnStatus(EReadStatus rst, EConnectStatus cst EReadStatus read_st = rst; EConnectStatus conn_st = cst; - if (i->id != dest_id) + if (cst != CONN_RENDEZVOUS && dest_id != 0) { - read_st = RST_AGAIN; - conn_st = CONN_AGAIN; + if (i->id != dest_id) + { + HLOGC(cnlog.Debug, log << "updateConnStatus: cst=" << ConnectStatusStr(cst) << " but for RID @" << i->id + << " dest_id=@" << dest_id << " - resetting to AGAIN"); + + read_st = RST_AGAIN; + conn_st = CONN_AGAIN; + } + else + { + HLOGC(cnlog.Debug, log << "updateConnStatus: cst=" << ConnectStatusStr(cst) << " and update came for @" + << i->id); + } + } + else + { + HLOGC(cnlog.Debug, log << "updateConnStatus: cst=" << ConnectStatusStr(cst) << " and dest_id=@" << dest_id + << " - NOT checking against RID @" << i->id); } HLOGC(cnlog.Debug, From dc779865bbedc83317e3a1fb49efc392f89dac5b Mon Sep 17 00:00:00 2001 From: Sektor van Skijlen Date: Thu, 24 Nov 2022 10:03:04 +0100 Subject: [PATCH 2/2] Minor log text update Co-authored-by: Maxim Sharabayko --- srtcore/queue.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srtcore/queue.cpp b/srtcore/queue.cpp index 6d49edcea..173dbdae1 100644 --- a/srtcore/queue.cpp +++ b/srtcore/queue.cpp @@ -909,7 +909,7 @@ void srt::CRendezvousQueue::updateConnStatus(EReadStatus rst, EConnectStatus cst } else { - HLOGC(cnlog.Debug, log << "updateConnStatus: cst=" << ConnectStatusStr(cst) << " and update came for @" + HLOGC(cnlog.Debug, log << "updateConnStatus: cst=" << ConnectStatusStr(cst) << " for @" << i->id); } }