summaryrefslogtreecommitdiff
path: root/node/NetworkConfig.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'node/NetworkConfig.cpp')
-rw-r--r--node/NetworkConfig.cpp436
1 files changed, 179 insertions, 257 deletions
diff --git a/node/NetworkConfig.cpp b/node/NetworkConfig.cpp
index a8ab4dac..07e9bd4f 100644
--- a/node/NetworkConfig.cpp
+++ b/node/NetworkConfig.cpp
@@ -18,6 +18,8 @@
#include <stdint.h>
+#include <algorithm>
+
#include "NetworkConfig.hpp"
#include "Utils.hpp"
@@ -25,204 +27,152 @@ namespace ZeroTier {
bool NetworkConfig::toDictionary(Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d,bool includeLegacy) const
{
- Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY> tmp;
+ Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY> *tmp = new Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY>();
- d.clear();
+ try {
+ d.clear();
- // Try to put the more human-readable fields first
+ // Try to put the more human-readable fields first
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_VERSION,(uint64_t)ZT_NETWORKCONFIG_VERSION)) return false;
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_NETWORK_ID,this->networkId)) return false;
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_TIMESTAMP,this->timestamp)) return false;
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_REVISION,this->revision)) return false;
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_ISSUED_TO,this->issuedTo)) return false;
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_FLAGS,this->flags)) return false;
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_MULTICAST_LIMIT,(uint64_t)this->multicastLimit)) return false;
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_TYPE,(uint64_t)this->type)) return false;
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_NAME,this->name)) return false;
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_VERSION,(uint64_t)ZT_NETWORKCONFIG_VERSION)) return false;
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_NETWORK_ID,this->networkId)) return false;
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_TIMESTAMP,this->timestamp)) return false;
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_REVISION,this->revision)) return false;
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_ISSUED_TO,this->issuedTo)) return false;
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_FLAGS,this->flags)) return false;
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_MULTICAST_LIMIT,(uint64_t)this->multicastLimit)) return false;
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_TYPE,(uint64_t)this->type)) return false;
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_NAME,this->name)) return false;
#ifdef ZT_SUPPORT_OLD_STYLE_NETCONF
- if (includeLegacy) {
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_ALLOW_PASSIVE_BRIDGING_OLD,this->allowPassiveBridging())) return false;
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_ENABLE_BROADCAST_OLD,this->enableBroadcast())) return false;
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_PRIVATE_OLD,this->isPrivate())) return false;
-
- std::string v4s;
- for(unsigned int i=0;i<staticIpCount;++i) {
- if (this->staticIps[i].ss_family == AF_INET) {
- if (v4s.length() > 0)
- v4s.push_back(',');
- v4s.append(this->staticIps[i].toString());
+ if (includeLegacy) {
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_ALLOW_PASSIVE_BRIDGING_OLD,this->allowPassiveBridging())) return false;
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_ENABLE_BROADCAST_OLD,this->enableBroadcast())) return false;
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_PRIVATE_OLD,this->isPrivate())) return false;
+
+ std::string v4s;
+ for(unsigned int i=0;i<staticIpCount;++i) {
+ if (this->staticIps[i].ss_family == AF_INET) {
+ if (v4s.length() > 0)
+ v4s.push_back(',');
+ v4s.append(this->staticIps[i].toString());
+ }
}
- }
- if (v4s.length() > 0) {
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_IPV4_STATIC_OLD,v4s.c_str())) return false;
- }
- std::string v6s;
- for(unsigned int i=0;i<staticIpCount;++i) {
- if (this->staticIps[i].ss_family == AF_INET6) {
- if (v6s.length() > 0)
- v6s.push_back(',');
- v6s.append(this->staticIps[i].toString());
+ if (v4s.length() > 0) {
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_IPV4_STATIC_OLD,v4s.c_str())) return false;
+ }
+ std::string v6s;
+ for(unsigned int i=0;i<staticIpCount;++i) {
+ if (this->staticIps[i].ss_family == AF_INET6) {
+ if (v6s.length() > 0)
+ v6s.push_back(',');
+ v6s.append(this->staticIps[i].toString());
+ }
+ }
+ if (v6s.length() > 0) {
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_IPV6_STATIC_OLD,v6s.c_str())) return false;
}
- }
- if (v6s.length() > 0) {
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_IPV6_STATIC_OLD,v6s.c_str())) return false;
- }
- std::string ets;
- unsigned int et = 0;
- ZT_VirtualNetworkRuleType lastrt = ZT_NETWORK_RULE_ACTION_ACCEPT;
- for(unsigned int i=0;i<ruleCount;++i) {
- ZT_VirtualNetworkRuleType rt = (ZT_VirtualNetworkRuleType)(rules[i].t & 0x7f);
- if (rt == ZT_NETWORK_RULE_MATCH_ETHERTYPE) {
- et = rules[i].v.etherType;
- } else if (rt == ZT_NETWORK_RULE_ACTION_ACCEPT) {
- if (((int)lastrt < 32)||(lastrt == ZT_NETWORK_RULE_MATCH_ETHERTYPE)) {
- if (ets.length() > 0)
- ets.push_back(',');
- char tmp[16];
- Utils::snprintf(tmp,sizeof(tmp),"%x",et);
- ets.append(tmp);
+ std::string ets;
+ unsigned int et = 0;
+ ZT_VirtualNetworkRuleType lastrt = ZT_NETWORK_RULE_ACTION_ACCEPT;
+ for(unsigned int i=0;i<ruleCount;++i) {
+ ZT_VirtualNetworkRuleType rt = (ZT_VirtualNetworkRuleType)(rules[i].t & 0x7f);
+ if (rt == ZT_NETWORK_RULE_MATCH_ETHERTYPE) {
+ et = rules[i].v.etherType;
+ } else if (rt == ZT_NETWORK_RULE_ACTION_ACCEPT) {
+ if (((int)lastrt < 32)||(lastrt == ZT_NETWORK_RULE_MATCH_ETHERTYPE)) {
+ if (ets.length() > 0)
+ ets.push_back(',');
+ char tmp2[16];
+ Utils::snprintf(tmp2,sizeof(tmp2),"%x",et);
+ ets.append(tmp2);
+ }
+ et = 0;
}
- et = 0;
+ lastrt = rt;
+ }
+ if (ets.length() > 0) {
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_ALLOWED_ETHERNET_TYPES_OLD,ets.c_str())) return false;
}
- lastrt = rt;
- }
- if (ets.length() > 0) {
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_ALLOWED_ETHERNET_TYPES_OLD,ets.c_str())) return false;
- }
- if (this->com) {
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATE_OF_MEMBERSHIP_OLD,this->com.toString().c_str())) return false;
- }
+ if (this->com) {
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATE_OF_MEMBERSHIP_OLD,this->com.toString().c_str())) return false;
+ }
- std::string ab;
- for(unsigned int i=0;i<this->specialistCount;++i) {
- if ((this->specialists[i] & ZT_NETWORKCONFIG_SPECIALIST_TYPE_ACTIVE_BRIDGE) != 0) {
- if (ab.length() > 0)
- ab.push_back(',');
- ab.append(Address(this->specialists[i]).toString().c_str());
+ std::string ab;
+ for(unsigned int i=0;i<this->specialistCount;++i) {
+ if ((this->specialists[i] & ZT_NETWORKCONFIG_SPECIALIST_TYPE_ACTIVE_BRIDGE) != 0) {
+ if (ab.length() > 0)
+ ab.push_back(',');
+ ab.append(Address(this->specialists[i]).toString().c_str());
+ }
+ }
+ if (ab.length() > 0) {
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_ACTIVE_BRIDGES_OLD,ab.c_str())) return false;
}
}
- if (ab.length() > 0) {
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_ACTIVE_BRIDGES_OLD,ab.c_str())) return false;
- }
- }
#endif // ZT_SUPPORT_OLD_STYLE_NETCONF
- // Then add binary blobs
+ // Then add binary blobs
- if (this->com) {
- tmp.clear();
- this->com.serialize(tmp);
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_COM,tmp)) return false;
- }
+ if (this->com) {
+ tmp->clear();
+ this->com.serialize(*tmp);
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_COM,*tmp)) return false;
+ }
- tmp.clear();
- for(unsigned int i=0;i<this->specialistCount;++i) {
- tmp.append((uint64_t)this->specialists[i]);
- }
- if (tmp.size()) {
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_SPECIALISTS,tmp)) return false;
- }
+ tmp->clear();
+ for(unsigned int i=0;i<this->capabilityCount;++i)
+ this->capabilities[i].serialize(*tmp);
+ if (tmp->size()) {
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_CAPABILITIES,*tmp)) return false;
+ }
- tmp.clear();
- for(unsigned int i=0;i<this->routeCount;++i) {
- reinterpret_cast<const InetAddress *>(&(this->routes[i].target))->serialize(tmp);
- reinterpret_cast<const InetAddress *>(&(this->routes[i].via))->serialize(tmp);
- tmp.append((uint16_t)this->routes[i].flags);
- tmp.append((uint16_t)this->routes[i].metric);
- }
- if (tmp.size()) {
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_ROUTES,tmp)) return false;
- }
+ tmp->clear();
+ for(unsigned int i=0;i<this->tagCount;++i)
+ this->tags[i].serialize(*tmp);
+ if (tmp->size()) {
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_TAGS,*tmp)) return false;
+ }
- tmp.clear();
- for(unsigned int i=0;i<this->staticIpCount;++i) {
- this->staticIps[i].serialize(tmp);
- }
- if (tmp.size()) {
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_STATIC_IPS,tmp)) return false;
- }
+ tmp->clear();
+ for(unsigned int i=0;i<this->specialistCount;++i)
+ tmp->append((uint64_t)this->specialists[i]);
+ if (tmp->size()) {
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_SPECIALISTS,*tmp)) return false;
+ }
- tmp.clear();
- for(unsigned int i=0;i<this->ruleCount;++i) {
- tmp.append((uint8_t)rules[i].t);
- switch((ZT_VirtualNetworkRuleType)(rules[i].t & 0x7f)) {
- //case ZT_NETWORK_RULE_ACTION_DROP:
- //case ZT_NETWORK_RULE_ACTION_ACCEPT:
- default:
- tmp.append((uint8_t)0);
- break;
- case ZT_NETWORK_RULE_ACTION_TEE:
- case ZT_NETWORK_RULE_ACTION_REDIRECT:
- case ZT_NETWORK_RULE_MATCH_SOURCE_ZEROTIER_ADDRESS:
- case ZT_NETWORK_RULE_MATCH_DEST_ZEROTIER_ADDRESS:
- tmp.append((uint8_t)5);
- Address(rules[i].v.zt).appendTo(tmp);
- break;
- case ZT_NETWORK_RULE_MATCH_VLAN_ID:
- tmp.append((uint8_t)2);
- tmp.append((uint16_t)rules[i].v.vlanId);
- break;
- case ZT_NETWORK_RULE_MATCH_VLAN_PCP:
- tmp.append((uint8_t)1);
- tmp.append((uint8_t)rules[i].v.vlanPcp);
- break;
- case ZT_NETWORK_RULE_MATCH_VLAN_DEI:
- tmp.append((uint8_t)1);
- tmp.append((uint8_t)rules[i].v.vlanDei);
- break;
- case ZT_NETWORK_RULE_MATCH_ETHERTYPE:
- tmp.append((uint8_t)2);
- tmp.append((uint16_t)rules[i].v.etherType);
- break;
- case ZT_NETWORK_RULE_MATCH_MAC_SOURCE:
- case ZT_NETWORK_RULE_MATCH_MAC_DEST:
- tmp.append((uint8_t)6);
- tmp.append(rules[i].v.mac,6);
- break;
- case ZT_NETWORK_RULE_MATCH_IPV4_SOURCE:
- case ZT_NETWORK_RULE_MATCH_IPV4_DEST:
- tmp.append((uint8_t)5);
- tmp.append(&(rules[i].v.ipv4.ip),4);
- tmp.append((uint8_t)rules[i].v.ipv4.mask);
- break;
- case ZT_NETWORK_RULE_MATCH_IPV6_SOURCE:
- case ZT_NETWORK_RULE_MATCH_IPV6_DEST:
- tmp.append((uint8_t)17);
- tmp.append(rules[i].v.ipv6.ip,16);
- tmp.append((uint8_t)rules[i].v.ipv6.mask);
- break;
- case ZT_NETWORK_RULE_MATCH_IP_TOS:
- tmp.append((uint8_t)1);
- tmp.append((uint8_t)rules[i].v.ipTos);
- break;
- case ZT_NETWORK_RULE_MATCH_IP_PROTOCOL:
- tmp.append((uint8_t)1);
- tmp.append((uint8_t)rules[i].v.ipProtocol);
- break;
- case ZT_NETWORK_RULE_MATCH_IP_SOURCE_PORT_RANGE:
- case ZT_NETWORK_RULE_MATCH_IP_DEST_PORT_RANGE:
- tmp.append((uint8_t)4);
- tmp.append((uint16_t)rules[i].v.port[0]);
- tmp.append((uint16_t)rules[i].v.port[1]);
- break;
- case ZT_NETWORK_RULE_MATCH_CHARACTERISTICS:
- tmp.append((uint8_t)16);
- tmp.append((uint64_t)rules[i].v.characteristics[0]);
- tmp.append((uint64_t)rules[i].v.characteristics[1]);
- break;
- case ZT_NETWORK_RULE_MATCH_FRAME_SIZE_RANGE:
- tmp.append((uint8_t)4);
- tmp.append((uint16_t)rules[i].v.frameSize[0]);
- tmp.append((uint16_t)rules[i].v.frameSize[1]);
- break;
+ tmp->clear();
+ for(unsigned int i=0;i<this->routeCount;++i) {
+ reinterpret_cast<const InetAddress *>(&(this->routes[i].target))->serialize(*tmp);
+ reinterpret_cast<const InetAddress *>(&(this->routes[i].via))->serialize(*tmp);
+ tmp->append((uint16_t)this->routes[i].flags);
+ tmp->append((uint16_t)this->routes[i].metric);
}
- }
- if (tmp.size()) {
- if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_RULES,tmp)) return false;
+ if (tmp->size()) {
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_ROUTES,*tmp)) return false;
+ }
+
+ tmp->clear();
+ for(unsigned int i=0;i<this->staticIpCount;++i)
+ this->staticIps[i].serialize(*tmp);
+ if (tmp->size()) {
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_STATIC_IPS,*tmp)) return false;
+ }
+
+ if (this->ruleCount) {
+ tmp->clear();
+ Capability::serializeRules(*tmp,rules,ruleCount);
+ if (tmp->size()) {
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_RULES,*tmp)) return false;
+ }
+ }
+
+ delete tmp;
+ } catch ( ... ) {
+ delete tmp;
+ throw;
}
return true;
@@ -230,26 +180,31 @@ bool NetworkConfig::toDictionary(Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d,b
bool NetworkConfig::fromDictionary(const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d)
{
- try {
- Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY> tmp;
- char tmp2[ZT_NETWORKCONFIG_DICT_CAPACITY];
+ Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY> *tmp = new Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY>();
+ try {
memset(this,0,sizeof(NetworkConfig));
// Fields that are always present, new or old
this->networkId = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_NETWORK_ID,0);
- if (!this->networkId)
+ if (!this->networkId) {
+ delete tmp;
return false;
+ }
this->timestamp = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_TIMESTAMP,0);
this->revision = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_REVISION,0);
this->issuedTo = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_ISSUED_TO,0);
- if (!this->issuedTo)
+ if (!this->issuedTo) {
+ delete tmp;
return false;
+ }
this->multicastLimit = (unsigned int)d.getUI(ZT_NETWORKCONFIG_DICT_KEY_MULTICAST_LIMIT,0);
d.get(ZT_NETWORKCONFIG_DICT_KEY_NAME,this->name,sizeof(this->name));
if (d.getUI(ZT_NETWORKCONFIG_DICT_KEY_VERSION,0) < 6) {
#ifdef ZT_SUPPORT_OLD_STYLE_NETCONF
+ char tmp2[1024];
+
// Decode legacy fields if version is old
if (d.getB(ZT_NETWORKCONFIG_DICT_KEY_ALLOW_PASSIVE_BRIDGING_OLD))
this->flags |= ZT_NETWORKCONFIG_FLAG_ALLOW_PASSIVE_BRIDGING;
@@ -305,6 +260,7 @@ bool NetworkConfig::fromDictionary(const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACI
}
}
#else
+ delete tmp;
return false;
#endif // ZT_SUPPORT_OLD_STYLE_NETCONF
} else {
@@ -312,99 +268,63 @@ bool NetworkConfig::fromDictionary(const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACI
this->flags = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_FLAGS,0);
this->type = (ZT_VirtualNetworkType)d.getUI(ZT_NETWORKCONFIG_DICT_KEY_TYPE,(uint64_t)ZT_NETWORK_TYPE_PRIVATE);
- if (d.get(ZT_NETWORKCONFIG_DICT_KEY_COM,tmp)) {
- this->com.deserialize(tmp,0);
+ if (d.get(ZT_NETWORKCONFIG_DICT_KEY_COM,*tmp))
+ this->com.deserialize(*tmp,0);
+
+ if (d.get(ZT_NETWORKCONFIG_DICT_KEY_CAPABILITIES,*tmp)) {
+ try {
+ unsigned int p = 0;
+ while (p < tmp->size()) {
+ Capability cap;
+ p += cap.deserialize(*tmp,p);
+ this->capabilities[this->capabilityCount++] = cap;
+ }
+ } catch ( ... ) {}
+ std::sort(&(this->capabilities[0]),&(this->capabilities[this->capabilityCount]));
+ }
+
+ if (d.get(ZT_NETWORKCONFIG_DICT_KEY_TAGS,*tmp)) {
+ try {
+ unsigned int p = 0;
+ while (p < tmp->size()) {
+ Tag tag;
+ p += tag.deserialize(*tmp,p);
+ this->tags[this->tagCount++] = tag;
+ }
+ } catch ( ... ) {}
+ std::sort(&(this->tags[0]),&(this->tags[this->tagCount]));
}
- if (d.get(ZT_NETWORKCONFIG_DICT_KEY_SPECIALISTS,tmp)) {
+ if (d.get(ZT_NETWORKCONFIG_DICT_KEY_SPECIALISTS,*tmp)) {
unsigned int p = 0;
- while (((p + 8) <= tmp.size())&&(specialistCount < ZT_MAX_NETWORK_SPECIALISTS)) {
- this->specialists[this->specialistCount++] = tmp.at<uint64_t>(p);
+ while (((p + 8) <= tmp->size())&&(specialistCount < ZT_MAX_NETWORK_SPECIALISTS)) {
+ this->specialists[this->specialistCount++] = tmp->at<uint64_t>(p);
p += 8;
}
}
- if (d.get(ZT_NETWORKCONFIG_DICT_KEY_ROUTES,tmp)) {
+ if (d.get(ZT_NETWORKCONFIG_DICT_KEY_ROUTES,*tmp)) {
unsigned int p = 0;
- while ((p < tmp.size())&&(routeCount < ZT_MAX_NETWORK_ROUTES)) {
- p += reinterpret_cast<InetAddress *>(&(this->routes[this->routeCount].target))->deserialize(tmp,p);
- p += reinterpret_cast<InetAddress *>(&(this->routes[this->routeCount].via))->deserialize(tmp,p);
- this->routes[this->routeCount].flags = tmp.at<uint16_t>(p); p += 2;
- this->routes[this->routeCount].metric = tmp.at<uint16_t>(p); p += 2;
+ while ((p < tmp->size())&&(routeCount < ZT_MAX_NETWORK_ROUTES)) {
+ p += reinterpret_cast<InetAddress *>(&(this->routes[this->routeCount].target))->deserialize(*tmp,p);
+ p += reinterpret_cast<InetAddress *>(&(this->routes[this->routeCount].via))->deserialize(*tmp,p);
+ this->routes[this->routeCount].flags = tmp->at<uint16_t>(p); p += 2;
+ this->routes[this->routeCount].metric = tmp->at<uint16_t>(p); p += 2;
++this->routeCount;
}
}
- if (d.get(ZT_NETWORKCONFIG_DICT_KEY_STATIC_IPS,tmp)) {
+ if (d.get(ZT_NETWORKCONFIG_DICT_KEY_STATIC_IPS,*tmp)) {
unsigned int p = 0;
- while ((p < tmp.size())&&(staticIpCount < ZT_MAX_ZT_ASSIGNED_ADDRESSES)) {
- p += this->staticIps[this->staticIpCount++].deserialize(tmp,p);
+ while ((p < tmp->size())&&(staticIpCount < ZT_MAX_ZT_ASSIGNED_ADDRESSES)) {
+ p += this->staticIps[this->staticIpCount++].deserialize(*tmp,p);
}
}
- if (d.get(ZT_NETWORKCONFIG_DICT_KEY_RULES,tmp)) {
+ if (d.get(ZT_NETWORKCONFIG_DICT_KEY_RULES,*tmp)) {
+ this->ruleCount = 0;
unsigned int p = 0;
- while ((p < tmp.size())&&(ruleCount < ZT_MAX_NETWORK_RULES)) {
- rules[ruleCount].t = (uint8_t)tmp[p++];
- unsigned int fieldLen = (unsigned int)tmp[p++];
- switch((ZT_VirtualNetworkRuleType)(rules[ruleCount].t & 0x7f)) {
- default:
- break;
- case ZT_NETWORK_RULE_ACTION_TEE:
- case ZT_NETWORK_RULE_ACTION_REDIRECT:
- case ZT_NETWORK_RULE_MATCH_SOURCE_ZEROTIER_ADDRESS:
- case ZT_NETWORK_RULE_MATCH_DEST_ZEROTIER_ADDRESS:
- rules[ruleCount].v.zt = Address(tmp.field(p,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH).toInt();
- break;
- case ZT_NETWORK_RULE_MATCH_VLAN_ID:
- rules[ruleCount].v.vlanId = tmp.at<uint16_t>(p);
- break;
- case ZT_NETWORK_RULE_MATCH_VLAN_PCP:
- rules[ruleCount].v.vlanPcp = (uint8_t)tmp[p];
- break;
- case ZT_NETWORK_RULE_MATCH_VLAN_DEI:
- rules[ruleCount].v.vlanDei = (uint8_t)tmp[p];
- break;
- case ZT_NETWORK_RULE_MATCH_ETHERTYPE:
- rules[ruleCount].v.etherType = tmp.at<uint16_t>(p);
- break;
- case ZT_NETWORK_RULE_MATCH_MAC_SOURCE:
- case ZT_NETWORK_RULE_MATCH_MAC_DEST:
- memcpy(rules[ruleCount].v.mac,tmp.field(p,6),6);
- break;
- case ZT_NETWORK_RULE_MATCH_IPV4_SOURCE:
- case ZT_NETWORK_RULE_MATCH_IPV4_DEST:
- memcpy(&(rules[ruleCount].v.ipv4.ip),tmp.field(p,4),4);
- rules[ruleCount].v.ipv4.mask = (uint8_t)tmp[p + 4];
- break;
- case ZT_NETWORK_RULE_MATCH_IPV6_SOURCE:
- case ZT_NETWORK_RULE_MATCH_IPV6_DEST:
- memcpy(rules[ruleCount].v.ipv6.ip,tmp.field(p,16),16);
- rules[ruleCount].v.ipv6.mask = (uint8_t)tmp[p + 16];
- break;
- case ZT_NETWORK_RULE_MATCH_IP_TOS:
- rules[ruleCount].v.ipTos = (uint8_t)tmp[p];
- break;
- case ZT_NETWORK_RULE_MATCH_IP_PROTOCOL:
- rules[ruleCount].v.ipProtocol = (uint8_t)tmp[p];
- break;
- case ZT_NETWORK_RULE_MATCH_IP_SOURCE_PORT_RANGE:
- case ZT_NETWORK_RULE_MATCH_IP_DEST_PORT_RANGE:
- rules[ruleCount].v.port[0] = tmp.at<uint16_t>(p);
- rules[ruleCount].v.port[1] = tmp.at<uint16_t>(p + 2);
- break;
- case ZT_NETWORK_RULE_MATCH_CHARACTERISTICS:
- rules[ruleCount].v.characteristics[0] = tmp.at<uint64_t>(p);
- rules[ruleCount].v.characteristics[1] = tmp.at<uint64_t>(p + 8);
- break;
- case ZT_NETWORK_RULE_MATCH_FRAME_SIZE_RANGE:
- rules[ruleCount].v.frameSize[0] = tmp.at<uint16_t>(p);
- rules[ruleCount].v.frameSize[0] = tmp.at<uint16_t>(p + 2);
- break;
- }
- p += fieldLen;
- ++ruleCount;
- }
+ Capability::deserializeRules(*tmp,p,this->rules,this->ruleCount,ZT_MAX_NETWORK_RULES);
}
}
@@ -412,8 +332,10 @@ bool NetworkConfig::fromDictionary(const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACI
//dump();
//printf("~~~\n");
+ delete tmp;
return true;
} catch ( ... ) {
+ delete tmp;
return false;
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-21 10:52:00 +0000