Merge branch 'dev' into dev-extosdep
Some checks failed
/ build_macos (push) Has been cancelled
/ build_windows (push) Has been cancelled
/ build_ubuntu (push) Has been cancelled

# Conflicts:
#	controller/DB.hpp
#	controller/DBMirrorSet.cpp
#	controller/DBMirrorSet.hpp
#	controller/EmbeddedNetworkController.cpp
#	controller/FileDB.cpp
#	controller/FileDB.hpp
#	controller/LFDB.cpp
#	controller/LFDB.hpp
#	controller/PostgreSQL.cpp
#	controller/PostgreSQL.hpp
#	node/Metrics.cpp
#	node/Metrics.hpp
#	osdep/EthernetTap.cpp
#	osdep/Http.hpp
#	osdep/ManagedRoute.cpp
#	service/OneService.cpp
This commit is contained in:
Adam Ierymenko 2025-07-03 14:14:04 -04:00
commit 69de477d0b
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
39 changed files with 3625 additions and 2184 deletions

View file

@ -2217,6 +2217,7 @@ class OneServiceImpl : public OneService {
auto statusGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
ZT_NodeStatus status;
_node->status(&status);
auto out = json::object();
char tmp[256] = {};