From c7d7aa7b4a875b0f83812480e9771d2ad691a9f5 Mon Sep 17 00:00:00 2001 From: Maxim Sharabayko Date: Wed, 17 Apr 2024 12:41:31 +0200 Subject: [PATCH 1/3] [core] Minor connection logging improvement. Also downgraded some logs from 'note' to 'debug'. --- srtcore/api.cpp | 3 +++ srtcore/core.cpp | 8 +++++--- srtcore/queue.cpp | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/srtcore/api.cpp b/srtcore/api.cpp index d3e8af887..c4feffdff 100644 --- a/srtcore/api.cpp +++ b/srtcore/api.cpp @@ -656,6 +656,9 @@ int srt::CUDTUnited::newConnection(const SRTSOCKET listen, HLOGC(cnlog.Debug, log << "newConnection: mapping peer " << ns->m_PeerID << " to that socket (" << ns->m_SocketID << ")"); m_PeerRec[ns->getPeerSpec()].insert(ns->m_SocketID); + + LOGC(cnlog.Note, log << "New connection @" << ns->m_SocketID << " on listener @" << listen + << " (" << ns->m_SelfAddr.str() << ") from @" << ns->m_PeerID << " (" << peer.str() << ")"); } catch (...) { diff --git a/srtcore/core.cpp b/srtcore/core.cpp index 2e6551423..bf5dea06d 100644 --- a/srtcore/core.cpp +++ b/srtcore/core.cpp @@ -2101,9 +2101,9 @@ int srt::CUDT::processSrtMsg_HSREQ(const uint32_t *srtdata, size_t bytelen, uint return SRT_CMD_NONE; } - LOGC(cnlog.Note, log << "HSREQ/rcv: cmd=" << SRT_CMD_HSREQ << "(HSREQ) len=" << bytelen - << hex << " vers=0x" << srtdata[SRT_HS_VERSION] << " opts=0x" << srtdata[SRT_HS_FLAGS] - << dec << " delay=" << SRT_HS_LATENCY_RCV::unwrap(srtdata[SRT_HS_LATENCY])); + LOGC(cnlog.Debug, log << "HSREQ/rcv: cmd=" << SRT_CMD_HSREQ << "(HSREQ) len=" << bytelen + << hex << " vers=0x" << srtdata[SRT_HS_VERSION] << " opts=0x" << srtdata[SRT_HS_FLAGS] + << dec << " delay=" << SRT_HS_LATENCY_RCV::unwrap(srtdata[SRT_HS_LATENCY])); m_uPeerSrtVersion = srtdata[SRT_HS_VERSION]; m_uPeerSrtFlags = srtdata[SRT_HS_FLAGS]; @@ -11290,6 +11290,8 @@ int srt::CUDT::processConnectRequest(const sockaddr_any& addr, CPacket& packet) HLOGC(cnlog.Debug, log << CONID() << "processConnectRequest: accepted connection, updating epoll to write-ready"); + LOGC(cnlog.Note, log << CONID() << "Listener accepted connection @" << hs.m_iReqType << " - " << RequestTypeStr(hs.m_iReqType)); + // New connection has been accepted or an existing one has been found. Update epoll write-readiness. // a new connection has been created, enable epoll for write // Note: not using SRT_EPOLL_CONNECT symbol because this is a procedure diff --git a/srtcore/queue.cpp b/srtcore/queue.cpp index 345151b4e..8ad27217c 100644 --- a/srtcore/queue.cpp +++ b/srtcore/queue.cpp @@ -1407,7 +1407,7 @@ srt::EConnectStatus srt::CRcvQueue::worker_ProcessConnectionRequest(CUnit* unit, ScopedLock cg(m_LSLock); if (m_pListener) { - LOGC(cnlog.Note, log << "PASSING request from: " << addr.str() << " to agent:" << m_pListener->socketID()); + LOGC(cnlog.Debug, log << "PASSING request from: " << addr.str() << " to listener:" << m_pListener->socketID()); listener_ret = m_pListener->processConnectRequest(addr, unit->m_Packet); // This function does return a code, but it's hard to say as to whether @@ -1426,8 +1426,8 @@ srt::EConnectStatus srt::CRcvQueue::worker_ProcessConnectionRequest(CUnit* unit, if (have_listener) // That is, the above block with m_pListener->processConnectRequest was executed { - LOGC(cnlog.Note, - log << CONID() << "Listener managed the connection request from: " << addr.str() + LOGC(cnlog.Debug, + log << CONID() << "Listener got the connection request from: " << addr.str() << " result:" << RequestTypeStr(UDTRequestType(listener_ret))); return listener_ret == SRT_REJ_UNKNOWN ? CONN_CONTINUE : CONN_REJECT; } From f9471f02232a5d11cd7020ee77f25c8cf6d5062c Mon Sep 17 00:00:00 2001 From: Maxim Sharabayko Date: Thu, 18 Apr 2024 11:29:40 +0200 Subject: [PATCH 2/3] Adjustments after code review. --- srtcore/api.cpp | 4 ++-- srtcore/core.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/srtcore/api.cpp b/srtcore/api.cpp index c4feffdff..56c581fec 100644 --- a/srtcore/api.cpp +++ b/srtcore/api.cpp @@ -657,8 +657,8 @@ int srt::CUDTUnited::newConnection(const SRTSOCKET listen, << " to that socket (" << ns->m_SocketID << ")"); m_PeerRec[ns->getPeerSpec()].insert(ns->m_SocketID); - LOGC(cnlog.Note, log << "New connection @" << ns->m_SocketID << " on listener @" << listen - << " (" << ns->m_SelfAddr.str() << ") from @" << ns->m_PeerID << " (" << peer.str() << ")"); + LOGC(cnlog.Note, log << "@" << ns->m_SocketID << " connection on listener @" << listen + << " (" << ns->m_SelfAddr.str() << ") from peer @" << ns->m_PeerID << " (" << peer.str() << ")"); } catch (...) { diff --git a/srtcore/core.cpp b/srtcore/core.cpp index bf5dea06d..f92254807 100644 --- a/srtcore/core.cpp +++ b/srtcore/core.cpp @@ -4968,8 +4968,9 @@ EConnectStatus srt::CUDT::postConnect(const CPacket* pResponse, bool rendezvous, } */ - - LOGC(cnlog.Note, log << CONID() << "Connection established to: " << m_PeerAddr.str()); + + LOGC(cnlog.Note, log << CONID() << "Connection established from (" + << m_SourceAddr.str() << ") to peer @" << m_PeerID << " (" << m_PeerAddr.str() << ")"); return CONN_ACCEPT; } From e65deb03f22a8d5601145b5bc319039a2d3f13e5 Mon Sep 17 00:00:00 2001 From: Maxim Sharabayko Date: Thu, 18 Apr 2024 11:39:20 +0200 Subject: [PATCH 3/3] Additional improvements --- srtcore/core.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/srtcore/core.cpp b/srtcore/core.cpp index f92254807..4a8ce550e 100644 --- a/srtcore/core.cpp +++ b/srtcore/core.cpp @@ -11291,8 +11291,6 @@ int srt::CUDT::processConnectRequest(const sockaddr_any& addr, CPacket& packet) HLOGC(cnlog.Debug, log << CONID() << "processConnectRequest: accepted connection, updating epoll to write-ready"); - LOGC(cnlog.Note, log << CONID() << "Listener accepted connection @" << hs.m_iReqType << " - " << RequestTypeStr(hs.m_iReqType)); - // New connection has been accepted or an existing one has been found. Update epoll write-readiness. // a new connection has been created, enable epoll for write // Note: not using SRT_EPOLL_CONNECT symbol because this is a procedure @@ -11331,7 +11329,7 @@ int srt::CUDT::processConnectRequest(const sockaddr_any& addr, CPacket& packet) } } } - LOGC(cnlog.Note, log << CONID() << "listen ret: " << hs.m_iReqType << " - " << RequestTypeStr(hs.m_iReqType)); + LOGC(cnlog.Debug, log << CONID() << "listen ret: " << hs.m_iReqType << " - " << RequestTypeStr(hs.m_iReqType)); return RejectReasonForURQ(hs.m_iReqType); }