Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] Fix unpublishing on client disconnect (#7042)

Browse Source
This commit is contained in:
Peter Johnson
2024-09-08 10:35:05 -07:00
committed by GitHub
parent cd9922af49
commit 7bdecab729
2 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ntcore/src/main/native/cpp/net/ServerImpl.cpp
View File

@@ -1265,6 +1265,7 @@ void ServerImpl::RemoveClient(int clientId) {
if (tcdIt != topic->clients.end()) {
pubChanged = !tcdIt->second.publishers.empty();
subChanged = !tcdIt->second.subscribers.empty();
topic->publisherCount -= tcdIt->second.publishers.size();
topic->clients.erase(tcdIt);
}

71
ntcore/src/test/native/cpp/net/ServerImplTest.cpp
View File

@@ -305,6 +305,77 @@ TEST_F(ServerImplTest, ClientSubTopicOnlyThenValue) {
server.SendOutgoing(id, 200);
}
TEST_F(ServerImplTest, ClientDisconnectUnpublish) {
server.SetLocal(&local);
NT_Publisher pubLocalHandle = nt::Handle{0, 1, nt::Handle::kPublisher};
NT_Topic topicLocalHandle = nt::Handle{0, 1, nt::Handle::kTopic};
NT_Publisher subHandle = nt::Handle{0, 1, nt::Handle::kSubscriber};
{
::testing::InSequence seq;
EXPECT_CALL(local, NetworkAnnounce(std::string_view{"test2"},
std::string_view{"double"},
wpi::json::object(), pubLocalHandle));
EXPECT_CALL(local, NetworkAnnounce(std::string_view{"test"},
std::string_view{"double"},
wpi::json::object(), 0));
EXPECT_CALL(local, NetworkUnannounce(std::string_view{"test"}));
}
{
std::vector<net::ClientMessage> msgs;
msgs.emplace_back(net::ClientMessage{net::PublishMsg{pubLocalHandle,
topicLocalHandle,
"test2",
"double",
wpi::json::object(),
{}}});
msgs.emplace_back(net::ClientMessage{
net::ClientValueMsg{pubLocalHandle, Value::MakeDouble(1.0, 10)}});
server.HandleLocal(msgs);
}
{
std::vector<net::ClientMessage> msgs;
msgs.emplace_back(
net::ClientMessage{net::SubscribeMsg{subHandle, {"test"}, {}}});
server.HandleLocal(msgs);
}
::testing::StrictMock<net::MockWireConnection> wire;
EXPECT_CALL(wire, GetVersion()).WillRepeatedly(Return(0x0401));
MockSetPeriodicFunc setPeriodic;
{
::testing::InSequence seq;
EXPECT_CALL(wire, GetLastReceivedTime()).WillOnce(Return(0));
EXPECT_CALL(wire, SendPing(100));
EXPECT_CALL(wire, Ready()).WillOnce(Return(true)); // SendValues()
EXPECT_CALL(
wire, DoWriteText(StrEq(EncodeText1(net::ServerMessage{net::AnnounceMsg{
"test", 8, "double", 1, wpi::json::object()}}))))
.WillOnce(Return(0));
EXPECT_CALL(wire, Flush()); // SendValues()
}
// connect client
auto [name, id] = server.AddClient("test", "connInfo", false, wire,
setPeriodic.AsStdFunction());
// publish topic
{
NT_Publisher pubHandle = nt::Handle{0, 1, nt::Handle::kPublisher};
NT_Topic topicHandle = nt::Handle{0, 1, nt::Handle::kTopic};
std::vector<net::ClientMessage> msgs;
msgs.emplace_back(net::ClientMessage{net::PublishMsg{
pubHandle, topicHandle, "test", "double", wpi::json::object(), {}}});
server.ProcessIncomingText(id, EncodeText(msgs));
}
server.SendOutgoing(id, 100);
// disconnect client
server.RemoveClient(id);
}
TEST_F(ServerImplTest, ZeroTimestampNegativeTime) {
// publish before client connect
server.SetLocal(&local);