Skip to content

[ntcore] Fix publish-triggered announcements being blocked by subscription announcements #8515

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

Open
cjlawson02 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[ntcore] Fix publish-triggered announcements being blocked by subscription announcements #8515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89affcc
[ntcore] Fix publish-triggered announcements being blocked by subscri…
cjlawson02 Dec 27, 2025
2c4bfee
fix: format
cjlawson02 Dec 27, 2025
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
6 changes: 5 additions & 1 deletion ntcore/src/main/native/cpp/server/ServerClient4.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,11 @@ void ServerClient4::SendValue(ServerTopic* topic, const Value& value,
void ServerClient4::SendAnnounce(ServerTopic* topic,
std::optional<int> pubuid) {
auto& sent = m_announceSent[topic];
if (sent) {
// Allow publish-triggered announcements (with pubuid) even if a
// subscription-triggered announcement was already sent, as the spec requires
// the server to respond to publish messages with an announcement containing
// the pubuid.
if (sent && !pubuid.has_value()) {
return;
}
sent = true;
Expand Down
6 changes: 5 additions & 1 deletion ntcore/src/main/native/cpp/server/ServerClientLocal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ void ServerClientLocal::SendAnnounce(ServerTopic* topic,
std::optional<int> pubuid) {
if (m_local) {
auto& sent = m_announceSent[topic];
if (sent) {
// Allow publish-triggered announcements (with pubuid) even if a
// subscription-triggered announcement was already sent, as the spec
// requires the server to respond to publish messages with an announcement
// containing the pubuid.
if (sent && !pubuid.has_value()) {
return;
}
sent = true;
Expand Down
Loading