Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-27 02:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] Fix UID collisions between subscribers and multi-sub (#7198)

Browse Source 
The changes in #7189 caused an ambiguity between multi-subscribers and
normal subscribers, because the handle type no longer is sent to the network.

Multi-subscribers now go to the network with negative UIDs, normal
subscribers are positive UIDs.  UID 0 is never used.
This commit is contained in:
Peter Johnson
2024-10-11 21:39:55 -07:00
committed by GitHub
parent f1e032f5e6
commit 25c2e26ef8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ntcore/src/main/native/cpp/LocalStorage.cpp
View File

@@ -621,7 +621,7 @@ LocalStorage::SubscriberData* LocalStorage::Impl::AddLocalSubscriber(
}
if (m_network && !subscriber->config.hidden) {
DEBUG4("-> NetworkSubscribe({})", topic->name);
m_network->ClientSubscribe(Handle{subscriber->handle}.GetIndex(),
m_network->ClientSubscribe(1 + Handle{subscriber->handle}.GetIndex(),
{{topic->name}}, config);
}
@@ -650,7 +650,7 @@ LocalStorage::Impl::RemoveLocalSubscriber(NT_Subscriber subHandle) {
}
}
if (m_network && !subscriber->config.hidden) {
m_network->ClientUnsubscribe(Handle{subscriber->handle}.GetIndex());
m_network->ClientUnsubscribe(1 + Handle{subscriber->handle}.GetIndex());
}
}
return subscriber;
@@ -687,7 +687,7 @@ LocalStorage::MultiSubscriberData* LocalStorage::Impl::AddMultiSubscriber(
}
if (m_network && !subscriber->options.hidden) {
DEBUG4("-> NetworkSubscribe");
m_network->ClientSubscribe(Handle{subscriber->handle}.GetIndex(),
m_network->ClientSubscribe(-1 - Handle{subscriber->handle}.GetIndex(),
subscriber->prefixes, subscriber->options);
}
return subscriber;
@@ -706,7 +706,7 @@ LocalStorage::Impl::RemoveMultiSubscriber(NT_MultiSubscriber subHandle) {
}
}
if (m_network && !subscriber->options.hidden) {
m_network->ClientUnsubscribe(Handle{subscriber->handle}.GetIndex());
m_network->ClientUnsubscribe(-1 - Handle{subscriber->handle}.GetIndex());
}
}
return subscriber;
@@ -1141,13 +1141,13 @@ void LocalStorage::Impl::StartNetwork(net::ClientMessageHandler* network) {
}
for (auto&& subscriber : m_subscribers) {
if (!subscriber->config.hidden) {
network->ClientSubscribe(Handle{subscriber->handle}.GetIndex(),
network->ClientSubscribe(1 + Handle{subscriber->handle}.GetIndex(),
{{subscriber->topic->name}}, subscriber->config);
}
}
for (auto&& subscriber : m_multiSubscribers) {
if (!subscriber->options.hidden) {
network->ClientSubscribe(Handle{subscriber->handle}.GetIndex(),
network->ClientSubscribe(-1 - Handle{subscriber->handle}.GetIndex(),
subscriber->prefixes, subscriber->options);
}
}