mii/libdatachannel
1
0
Fork 0
mirror of https://github.com/mii443/libdatachannel.git synced 2025-08-22 15:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed possible static deinit order issue with SctpTransport instances set

Browse Source
This commit is contained in:
Paul-Louis Ageneau
2021-05-28 21:36:35 +02:00
parent fd97f98f23
commit 83cc26d4a5
2 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/impl/sctptransport.cpp
View File

@ -85,8 +85,30 @@ static LogCounter
static LogCounter COUNTER_BAD_SCTP_STATUS(plog::warning, static LogCounter COUNTER_BAD_SCTP_STATUS(plog::warning,
"Number of SCTP packets received with a bad status"); "Number of SCTP packets received with a bad status");
std::unordered_set<SctpTransport *> SctpTransport::Instances; class SctpTransport::InstancesSet {
std::shared_mutex SctpTransport::InstancesMutex; public:
void insert(SctpTransport *instance) {
std::unique_lock lock(mMutex);
mSet.insert(instance);
}
void erase(SctpTransport *instance) {
std::unique_lock lock(mMutex);
mSet.erase(instance);
}
using shared_lock = std::shared_lock<std::shared_mutex>;
optional<shared_lock> lock(SctpTransport *instance) {
shared_lock lock(mMutex);
return mSet.find(instance) != mSet.end() ? std::make_optional(std::move(lock)) : nullopt;
}
private:
std::unordered_set<SctpTransport *> mSet;
std::shared_mutex mMutex;
};
SctpTransport::InstancesSet *SctpTransport::Instances = new InstancesSet;
void SctpTransport::Init() { void SctpTransport::Init() {
usrsctp_init(0, &SctpTransport::WriteCallback, nullptr); usrsctp_init(0, &SctpTransport::WriteCallback, nullptr);
@ -143,10 +165,7 @@ SctpTransport::SctpTransport(shared_ptr<Transport> lower, const Configuration &c
PLOG_DEBUG << "Initializing SCTP transport"; PLOG_DEBUG << "Initializing SCTP transport";
usrsctp_register_address(this); usrsctp_register_address(this);
{ Instances->insert(this);
std::unique_lock lock(InstancesMutex);
Instances.insert(this);
}
mSock = usrsctp_socket(AF_CONN, SOCK_STREAM, IPPROTO_SCTP, nullptr, nullptr, 0, nullptr); mSock = usrsctp_socket(AF_CONN, SOCK_STREAM, IPPROTO_SCTP, nullptr, nullptr, 0, nullptr);
if (!mSock) if (!mSock)
@ -285,10 +304,7 @@ SctpTransport::~SctpTransport() {
close(); close();
usrsctp_deregister_address(this); usrsctp_deregister_address(this);
{ Instances->erase(this);
std::unique_lock lock(InstancesMutex);
Instances.erase(this);
}
} }
void SctpTransport::start() { void SctpTransport::start() {
@ -848,11 +864,8 @@ optional<milliseconds> SctpTransport::rtt() {
void SctpTransport::UpcallCallback(struct socket *, void *arg, int /* flags */) { void SctpTransport::UpcallCallback(struct socket *, void *arg, int /* flags */) {
auto *transport = static_cast<SctpTransport *>(arg); auto *transport = static_cast<SctpTransport *>(arg);
std::shared_lock lock(InstancesMutex); if(auto lock = Instances->lock(transport))
if (Instances.find(transport) == Instances.end()) transport->handleUpcall();
return;
transport->handleUpcall();
} }
int SctpTransport::WriteCallback(void *ptr, void *data, size_t len, uint8_t tos, uint8_t set_df) { int SctpTransport::WriteCallback(void *ptr, void *data, size_t len, uint8_t tos, uint8_t set_df) {
@ -860,11 +873,10 @@ int SctpTransport::WriteCallback(void *ptr, void *data, size_t len, uint8_t tos,
// Workaround for sctplab/usrsctp#405: Send callback is invoked on already closed socket // Workaround for sctplab/usrsctp#405: Send callback is invoked on already closed socket
// https://github.com/sctplab/usrsctp/issues/405 // https://github.com/sctplab/usrsctp/issues/405
std::shared_lock lock(InstancesMutex); if(auto lock = Instances->lock(transport))
if (Instances.find(transport) == Instances.end()) return transport->handleWrite(static_cast<byte *>(data), len, tos, set_df);
else
return -1; return -1;
return transport->handleWrite(static_cast<byte *>(data), len, tos, set_df);
} }
} // namespace rtc::impl } // namespace rtc::impl

4
src/impl/sctptransport.hpp
View File

@ -120,8 +120,8 @@ private:
static void UpcallCallback(struct socket *sock, void *arg, int flags); static void UpcallCallback(struct socket *sock, void *arg, int flags);
static int WriteCallback(void *sctp_ptr, void *data, size_t len, uint8_t tos, uint8_t set_df); static int WriteCallback(void *sctp_ptr, void *data, size_t len, uint8_t tos, uint8_t set_df);
static std::unordered_set<SctpTransport *> Instances; class InstancesSet;
static std::shared_mutex InstancesMutex; static InstancesSet *Instances;
}; };
} // namespace rtc::impl } // namespace rtc::impl