void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-09-23 15:05:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix version string
Some checks are pending
/ build_macos (push) Waiting to run
Details
/ build_windows (push) Waiting to run
Details
/ Central Controller Build (push) Waiting to run
Details
/ multi-arch-docker (push) Blocked by required conditions
Details
/ build_ubuntu (push) Waiting to run
Details

Browse source
This commit is contained in:
Grant Limberg 2025-09-10 08:13:56 -07:00
parent 7aa451bec1
commit 493cc4fe4f
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
nonfree/controller/CentralDB.cpp
View file

@ -1563,10 +1563,19 @@ void CentralDB::onlineNotificationThread()
std::string arch = "unknown"; std::string arch = "unknown";
std::string frontend = member["frontend"].get<std::string>(); std::string frontend = member["frontend"].get<std::string>();
std::string vMajor = OSUtils::jsonString(member["vMajor"], "0"); int vMajor = OSUtils::jsonInt(member["vMajor"], 0);
std::string vMinor = OSUtils::jsonString(member["vMinor"], "0"); int vMinor = OSUtils::jsonInt(member["vMinor"], 0);
std::string vRev = OSUtils::jsonString(member["vRev"], "0"); int vRev = OSUtils::jsonInt(member["vRev"], 0);
std::string version = "v" + vMajor + "." + vMinor + "." + vRev; std::string version;
if (vMajor <= 0 && vMinor <= 0 && vRev <= 0) {
vMajor = 0;
vMinor = 0;
vRev = 0;
version = "unknown";
}
else {
version = "v" + std::to_string(vMajor) + "." + std::to_string(vMinor) + "." + std::to_string(vRev);
}
if (osArchSplit.size() == 2) { if (osArchSplit.size() == 2) {
os = osArchSplit[0]; os = osArchSplit[0];
arch = osArchSplit[1]; arch = osArchSplit[1];