mirror of
https://github.com/ZeroTier/ZeroTierOne
synced 2025-07-15 01:23:14 -07:00
Merge branch 'dev' into dev-extosdep
# 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:
commit
69de477d0b
39 changed files with 3625 additions and 2184 deletions
|
@ -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] = {};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue