Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STAR-1269: Fix allocation bug of client sockets vector #25

Merged
merged 1 commit into from
May 6, 2024
Merged

STAR-1269: Fix allocation bug of client sockets vector #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion SRTNet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,8 @@ std::vector<std::pair<SRTSOCKET, std::shared_ptr<SRTNet::NetworkConnection>>> SR
std::vector<SRTSOCKET> SRTNet::getActiveClientSockets() const {
std::lock_guard<std::mutex> lock(mClientListMtx);

std::vector<SRTSOCKET> clientSockets(mClientList.size());
std::vector<SRTSOCKET> clientSockets;
clientSockets.reserve(mClientList.size());
for (const auto& [socket, networkConnection] : mClientList) {
clientSockets.push_back(socket);
}
Expand Down
17 changes: 9 additions & 8 deletions test/TestSrt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ TEST(TestSrt, StartStop) {
ASSERT_TRUE(successfulWait) << "Timeout waiting for client to connect";
}

waitUntil([&]() { return !server.getActiveClients().empty(); },
std::chrono::seconds(1), std::chrono::milliseconds(10));
ASSERT_TRUE(waitUntil([&]() { return !server.getActiveClientSockets().empty(); },
std::chrono::seconds(1), std::chrono::milliseconds(10)));

const auto activeClients = server.getActiveClients();
size_t nClients = activeClients.size();
Expand Down Expand Up @@ -466,8 +466,8 @@ TEST_F(TestSRTFixture, SingleSender) {
ASSERT_TRUE(mClient.isConnectedToServer());

ASSERT_TRUE(waitForClientToConnect(std::chrono::seconds(2)));
waitUntil([&]() { return !mServer.getActiveClients().empty(); },
std::chrono::seconds(1), std::chrono::milliseconds(10));
ASSERT_TRUE(waitUntil([&]() { return !mServer.getActiveClientSockets().empty(); },
std::chrono::seconds(1), std::chrono::milliseconds(10)));

auto activeClients = mServer.getActiveClients();
size_t numberOfClients = activeClients.size();
Expand Down Expand Up @@ -513,8 +513,8 @@ TEST_F(TestSRTFixture, BindAddressForCaller) {


ASSERT_TRUE(waitForClientToConnect(std::chrono::seconds(2)));
waitUntil([&]() { return !mServer.getActiveClients().empty(); },
std::chrono::seconds(1), std::chrono::milliseconds(10));
ASSERT_TRUE(waitUntil([&]() { return !mServer.getActiveClientSockets().empty(); },
std::chrono::seconds(1), std::chrono::milliseconds(10)));

const auto activeClients = mServer.getActiveClients();
size_t numberOfClients = activeClients.size();
Expand Down Expand Up @@ -561,8 +561,9 @@ TEST_F(TestSRTFixture, AutomaticPortSelection) {
EXPECT_GT(clientIPAndPort.second, 1024); // We expect it won't pick a privileged port
EXPECT_NE(clientIPAndPort.second, serverIPAndPort.second);

waitUntil([&]() { return !mServer.getActiveClients().empty(); },
std::chrono::seconds(1), std::chrono::milliseconds(10));
ASSERT_TRUE(waitUntil([&]() { return !mServer.getActiveClientSockets().empty(); },
std::chrono::seconds(1), std::chrono::milliseconds(10)));

const auto activeClients = mServer.getActiveClients();
size_t nClients = activeClients.size();

Expand Down
Loading