mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2026-07-28 21:14:03 +08:00
7563db36bb
### Motivation - Restore the transport cleanup path on SRT session errors so `SrtTransport::onShutdown` runs its unregister logic and prevents unbounded growth of weak_ptr entries in the transport manager that could lead to a memory-exhaustion DoS. ### Description - Re-enabled shutdown cleanup in `srt/SrtSession.cpp` by capturing `err` in the delayed callback and calling `transport->onShutdown(err)` from the `getPoller()->async` lambda. ### Testing - Ran `cmake -S . -B build` to sanity-check configuration; configuration failed in this environment due to a missing `3rdpart/ZLToolKit` submodule and unrelated CMake errors, not due to the patch. ------ [Codex Task](https://chatgpt.com/codex/cloud/tasks/task_e_69b32b68f8ac8320b6a9b0fad53594c6) --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
94 lines
3.3 KiB
C++
94 lines
3.3 KiB
C++
#include "SrtSession.hpp"
|
||
#include "Packet.hpp"
|
||
#include "SrtTransportImp.hpp"
|
||
|
||
#include "Common/config.h"
|
||
|
||
namespace SRT {
|
||
using namespace mediakit;
|
||
|
||
SrtSession::SrtSession(const Socket::Ptr &sock)
|
||
: Session(sock) {
|
||
socklen_t addr_len = sizeof(_peer_addr);
|
||
memset(&_peer_addr, 0, addr_len);
|
||
// TraceL<<"before addr len "<<addr_len;
|
||
getpeername(sock->rawFD(), (struct sockaddr *)&_peer_addr, &addr_len);
|
||
// TraceL<<"after addr len "<<addr_len<<" family "<<_peer_addr.ss_family;
|
||
}
|
||
|
||
void SrtSession::attachServer(const toolkit::Server &server) {
|
||
SockUtil::setRecvBuf(getSock()->rawFD(), 1024 * 1024);
|
||
}
|
||
|
||
extern SrtTransport::Ptr querySrtTransport(uint8_t *data, size_t size, const EventPoller::Ptr& poller);
|
||
|
||
EventPoller::Ptr SrtSession::queryPoller(const Buffer::Ptr &buffer) {
|
||
auto transport = querySrtTransport((uint8_t *)buffer->data(), buffer->size(), nullptr);
|
||
return transport ? transport->getPoller() : nullptr;
|
||
}
|
||
|
||
void SrtSession::onRecv(const Buffer::Ptr &buffer) {
|
||
uint8_t *data = (uint8_t *)buffer->data();
|
||
size_t size = buffer->size();
|
||
|
||
if (_find_transport) {
|
||
// 只允许寻找一次transport [AUTO-TRANSLATED:620078e7]
|
||
// Only allow finding transport once
|
||
_find_transport = false;
|
||
_transport = querySrtTransport(data, size, getPoller());
|
||
if (_transport) {
|
||
_transport->setSession(static_pointer_cast<Session>(shared_from_this()));
|
||
}
|
||
InfoP(this);
|
||
}
|
||
_ticker.resetTime();
|
||
|
||
if (_transport) {
|
||
_transport->inputSockData(data, size, &_peer_addr);
|
||
} else {
|
||
// WarnL<< "ingore data";
|
||
}
|
||
}
|
||
|
||
void SrtSession::onError(const SockException &err) {
|
||
// udp链接超时，但是srt链接不一定超时，因为可能存在udp链接迁移的情况 [AUTO-TRANSLATED:8673c03c]
|
||
// UDP connection timed out, but SRT connection may not time out due to possible UDP connection migration
|
||
// 在udp链接迁移时，新的SrtSession对象将接管SrtSession对象的生命周期 [AUTO-TRANSLATED:13f0a9e6]
|
||
// When UDP connection migrates, a new SrtSession object will take over the lifecycle of the SrtSession object
|
||
// 本SrtSession对象将在超时后自动销毁 [AUTO-TRANSLATED:d0a34ab8]
|
||
// This SrtSession object will be automatically destroyed after timeout
|
||
WarnP(this) << err;
|
||
|
||
if (!_transport) {
|
||
return;
|
||
}
|
||
|
||
// 防止互相引用导致不释放 [AUTO-TRANSLATED:82547e46]
|
||
// Prevent mutual reference from causing non-release
|
||
auto transport = std::move(_transport);
|
||
|
||
// Only shut down the transport if this session is still the selected one;
|
||
// otherwise a migrated session has already taken over and should not be affected.
|
||
if (transport->getSession().get() != static_cast<Session *>(this)) {
|
||
return;
|
||
}
|
||
|
||
getPoller()->async(
|
||
[transport, err] {
|
||
// 延时减引用，防止使用transport对象时，销毁对象 [AUTO-TRANSLATED:09dd6609]
|
||
// Delayed dereference to prevent object destruction when using the transport object
|
||
transport->onShutdown(err);
|
||
},
|
||
false);
|
||
}
|
||
|
||
void SrtSession::onManager() {
|
||
GET_CONFIG(float, timeoutSec, kTimeOutSec);
|
||
if (_ticker.elapsedTime() > timeoutSec * 1000) {
|
||
shutdown(SockException(Err_timeout, "srt connection timeout"));
|
||
return;
|
||
}
|
||
}
|
||
|
||
} // namespace SRT
|