void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pipe member capabilites to network json

Browse source
This commit is contained in:
travisladuke 2023-09-15 13:32:34 -07:00
parent f187a6c34f
commit c36d8213f8
3 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/ZeroTierOne.h
View file

@ -1255,6 +1255,9 @@ typedef struct
uint32_t tags[ZT_MAX_NETWORK_TAGS][2]; uint32_t tags[ZT_MAX_NETWORK_TAGS][2];
unsigned int tagsCount; unsigned int tagsCount;
uint32_t capabilities[ZT_MAX_NETWORK_CAPABILITIES];
unsigned int capabilitiesCount;
} ZT_VirtualNetworkConfig; } ZT_VirtualNetworkConfig;

9
node/Network.cpp
View file

@ -1502,6 +1502,15 @@ void Network::_externalConfig(ZT_VirtualNetworkConfig *ec) const
} }
} }
for (unsigned int i = 0; i<ZT_MAX_NETWORK_CAPABILITIES; i++) {
if (_config.capabilities[i].id()) {
ec->capabilities[i] = _config.capabilities[i].id();
} else {
ec->capabilitiesCount = i;
break;
}
}
ec->assignedAddressCount = 0; ec->assignedAddressCount = 0;
for(unsigned int i=0;i<ZT_MAX_ZT_ASSIGNED_ADDRESSES;++i) { for(unsigned int i=0;i<ZT_MAX_ZT_ASSIGNED_ADDRESSES;++i) {
if (i < _config.staticIpCount) { if (i < _config.staticIpCount) {

10
service/OneService.cpp
View file

@ -554,6 +554,16 @@ static void _networkToJson(nlohmann::json &nj,NetworkState &ns)
} }
nj["tags"] = tags; nj["tags"] = tags;
nlohmann::json caps = nlohmann::json::array();
for(unsigned int i=0;i<ns.config().capabilitiesCount;++i) {
if (ns.config().capabilities[i]) {
caps[i] = ns.config().capabilities[i];
} else {
break;
}
}
nj["capabilities"] = caps;
nlohmann::json aa = nlohmann::json::array(); nlohmann::json aa = nlohmann::json::array();
for(unsigned int i=0;i<ns.config().assignedAddressCount;++i) { for(unsigned int i=0;i<ns.config().assignedAddressCount;++i) {