Skip to content

Only check GZ_TRANSPORT_TOPIC_STATISTICS once #731

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

Merged
merged 4 commits into from
Oct 24, 2025
Merged

Only check GZ_TRANSPORT_TOPIC_STATISTICS once #731

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43d0bd1
Only check GZ_TRANSPORT_TOPIC_STATISTICS once
caguero Oct 3, 2025
40fbf54
Tweaks
caguero Oct 3, 2025
82a886a
Merge branch 'main' into fix_issue_701
caguero Oct 23, 2025
28aadf9
Update Discovery::Version()
caguero Oct 23, 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
17 changes: 7 additions & 10 deletions src/Discovery.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,11 @@ namespace gz
this->hostInterfaces = determineInterfaces();
}

// Update the wire version if GZ_TRANSPORT_TOPIC_STATISTICS is set.
std::string gzStats;
if (env("GZ_TRANSPORT_TOPIC_STATISTICS", gzStats) && gzStats == "1")
this->wireVersion += 100;

#ifdef _WIN32
WORD wVersionRequested;
WSADATA wsaData;
Expand Down Expand Up @@ -1568,15 +1573,7 @@ namespace gz
/// \return The discovery version.
private: uint8_t Version() const
{
static std::string gzStats;
static int topicStats;

if (env("GZ_TRANSPORT_TOPIC_STATISTICS", gzStats) && !gzStats.empty())
{
topicStats = (gzStats == "1");
}

return this->kWireVersion + (topicStats * 100);
return this->wireVersion;
}

/// \brief Register a new network interface in the discovery system.
Expand Down Expand Up @@ -1653,7 +1650,7 @@ namespace gz

/// \brief Wire protocol version. Bump up the version number if you modify
/// the wire protocol (for discovery or message/service exchange).
private: static const uint8_t kWireVersion = 10;
private: uint8_t wireVersion = 10;

/// \brief Port used to broadcast the discovery messages.
private: int port;
Expand Down
Loading