summaryrefslogtreecommitdiff
path: root/node
diff options
context:
space:
mode:
Diffstat (limited to 'node')
-rw-r--r--node/Dictionary.hpp52
-rw-r--r--node/IncomingPacket.cpp6
-rw-r--r--node/Network.cpp6
-rw-r--r--node/NetworkConfig.cpp10
-rw-r--r--node/NetworkConfig.hpp7
-rw-r--r--node/NetworkController.hpp6
6 files changed, 49 insertions, 38 deletions
diff --git a/node/Dictionary.hpp b/node/Dictionary.hpp
index 658878f1..dd6c24f5 100644
--- a/node/Dictionary.hpp
+++ b/node/Dictionary.hpp
@@ -26,9 +26,6 @@
#include <stdint.h>
-// Can be increased if it's ever needed, but not too much.
-#define ZT_DICTIONARY_MAX_SIZE 8194
-
namespace ZeroTier {
/**
@@ -48,7 +45,10 @@ namespace ZeroTier {
*
* There is code to test and fuzz this in selftest.cpp. Fuzzing a blob of
* pointer tricks like this is important after any modifications.
+ *
+ * @tparam C Dictionary max capacity in bytes
*/
+template<unsigned int C>
class Dictionary
{
public:
@@ -64,8 +64,8 @@ public:
Dictionary(const char *s,unsigned int len)
{
- memcpy(_d,s,(len > ZT_DICTIONARY_MAX_SIZE) ? (unsigned int)ZT_DICTIONARY_MAX_SIZE : len);
- _d[ZT_DICTIONARY_MAX_SIZE-1] = (char)0;
+ memcpy(_d,s,(len > C) ? (unsigned int)C : len);
+ _d[C-1] = (char)0;
}
Dictionary(const Dictionary &d)
@@ -83,7 +83,7 @@ public:
* Load a dictionary from a C-string
*
* @param s Dictionary in string form
- * @return False if 's' was longer than ZT_DICTIONARY_MAX_SIZE
+ * @return False if 's' was longer than our capacity
*/
inline bool load(const char *s)
{
@@ -103,11 +103,11 @@ public:
*/
inline unsigned int sizeBytes() const
{
- for(unsigned int i=0;i<ZT_DICTIONARY_MAX_SIZE;++i) {
+ for(unsigned int i=0;i<C;++i) {
if (!_d[i])
return i;
}
- return ZT_DICTIONARY_MAX_SIZE;
+ return C;
}
/**
@@ -194,9 +194,10 @@ public:
* @param key Key to get
* @param dest Destination buffer
* @return True if key was found (if false, dest will be empty)
+ * @tparam BC Buffer capacity (usually inferred)
*/
- template<unsigned int C>
- inline bool get(const char *key,Buffer<C> &dest) const
+ template<unsigned int BC>
+ inline bool get(const char *key,Buffer<BC> &dest) const
{
const int r = this->get(key,const_cast<char *>(reinterpret_cast<const char *>(dest.data())),C);
if (r >= 0) {
@@ -254,13 +255,13 @@ public:
*/
inline bool add(const char *key,const char *value,int vlen = -1)
{
- for(unsigned int i=0;i<ZT_DICTIONARY_MAX_SIZE;++i) {
+ for(unsigned int i=0;i<C;++i) {
if (!_d[i]) {
unsigned int j = i;
if (j > 0) {
_d[j++] = '\n';
- if (j == ZT_DICTIONARY_MAX_SIZE) {
+ if (j == C) {
_d[i] = (char)0;
return false;
}
@@ -269,14 +270,14 @@ public:
const char *p = key;
while (*p) {
_d[j++] = *(p++);
- if (j == ZT_DICTIONARY_MAX_SIZE) {
+ if (j == C) {
_d[i] = (char)0;
return false;
}
}
_d[j++] = '=';
- if (j == ZT_DICTIONARY_MAX_SIZE) {
+ if (j == C) {
_d[i] = (char)0;
return false;
}
@@ -291,7 +292,7 @@ public:
case '\\':
case '=':
_d[j++] = '\\';
- if (j == ZT_DICTIONARY_MAX_SIZE) {
+ if (j == C) {
_d[i] = (char)0;
return false;
}
@@ -302,14 +303,14 @@ public:
case '\\': _d[j++] = '\\'; break;
case '=': _d[j++] = 'e'; break;
}
- if (j == ZT_DICTIONARY_MAX_SIZE) {
+ if (j == C) {
_d[i] = (char)0;
return false;
}
break;
default:
_d[j++] = *p;
- if (j == ZT_DICTIONARY_MAX_SIZE) {
+ if (j == C) {
_d[i] = (char)0;
return false;
}
@@ -356,10 +357,12 @@ public:
}
/**
- * Add a binary buffer
+ * Add a binary buffer's contents as a value
+ *
+ * @tparam BC Buffer capacity (usually inferred)
*/
- template<unsigned int C>
- inline bool add(const char *key,const Buffer<C> &value)
+ template<unsigned int BC>
+ inline bool add(const char *key,const Buffer<BC> &value)
{
return this->add(key,(const char *)value.data(),(int)value.size());
}
@@ -385,7 +388,7 @@ public:
*/
inline bool erase(const char *key)
{
- char d2[ZT_DICTIONARY_MAX_SIZE];
+ char d2[C];
char *saveptr = (char *)0;
unsigned int d2ptr = 0;
bool found = false;
@@ -419,8 +422,13 @@ public:
*/
inline const char *data() const { return _d; }
+ /**
+ * @return Value of C template parameter
+ */
+ inline unsigned int capacity() const { return C; }
+
private:
- char _d[ZT_DICTIONARY_MAX_SIZE];
+ char _d[C];
};
} // namespace ZeroTier
diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp
index f57fa2a8..532abafa 100644
--- a/node/IncomingPacket.cpp
+++ b/node/IncomingPacket.cpp
@@ -403,7 +403,7 @@ bool IncomingPacket::_doOK(const RuntimeEnvironment *RR,const SharedPtr<Peer> &p
if ((nw)&&(nw->controller() == peer->address())) {
const unsigned int nclen = at<uint16_t>(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_DICT_LEN);
if (nclen) {
- Dictionary dconf((const char *)field(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_DICT,nclen),nclen);
+ Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> dconf((const char *)field(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_DICT,nclen),nclen);
NetworkConfig nconf;
if (nconf.fromDictionary(dconf)) {
nw->setConfiguration(nconf,true);
@@ -684,7 +684,7 @@ bool IncomingPacket::_doNETWORK_CONFIG_REQUEST(const RuntimeEnvironment *RR,cons
const unsigned int metaDataLength = at<uint16_t>(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT_LEN);
const char *metaDataBytes = (const char *)field(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT,metaDataLength);
- const Dictionary metaData(metaDataBytes,metaDataLength);
+ const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> metaData(metaDataBytes,metaDataLength);
//const uint64_t haveRevision = ((ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT + metaDataLength + 8) <= size()) ? at<uint64_t>(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT + metaDataLength) : 0ULL;
@@ -697,7 +697,7 @@ bool IncomingPacket::_doNETWORK_CONFIG_REQUEST(const RuntimeEnvironment *RR,cons
switch(RR->localNetworkController->doNetworkConfigRequest((h > 0) ? InetAddress() : _remoteAddress,RR->identity,peer->identity(),nwid,metaData,netconf)) {
case NetworkController::NETCONF_QUERY_OK: {
- Dictionary dconf;
+ Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> dconf;
if (netconf.toDictionary(dconf,metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_VERSION,0) < 6)) {
Packet outp(peer->address(),RR->identity.address(),Packet::VERB_OK);
outp.append((unsigned char)Packet::VERB_NETWORK_CONFIG_REQUEST);
diff --git a/node/Network.cpp b/node/Network.cpp
index 82011c3d..25116647 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -64,7 +64,7 @@ Network::Network(const RuntimeEnvironment *renv,uint64_t nwid,void *uptr) :
try {
std::string conf(RR->node->dataStoreGet(confn));
if (conf.length()) {
- Dictionary dconf(conf.c_str());
+ Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> dconf(conf.c_str());
NetworkConfig nconf;
if (nconf.fromDictionary(dconf)) {
this->setConfiguration(nconf,false);
@@ -193,7 +193,7 @@ int Network::setConfiguration(const NetworkConfig &nconf,bool saveToDisk)
if (saveToDisk) {
char n[64];
Utils::snprintf(n,sizeof(n),"networks.d/%.16llx.conf",_id);
- Dictionary d;
+ Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> d;
if (nconf.toDictionary(d,false))
RR->node->dataStorePut(n,(const void *)d.data(),d.sizeBytes(),true);
}
@@ -210,7 +210,7 @@ void Network::requestConfiguration()
if (_id == ZT_TEST_NETWORK_ID) // pseudo-network-ID, uses locally generated static config
return;
- Dictionary rmd;
+ Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> rmd;
rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_VERSION,(uint64_t)ZT_NETWORKCONFIG_VERSION);
rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_PROTOCOL_VERSION,(uint64_t)ZT_PROTO_VERSION);
rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MAJOR_VERSION,(uint64_t)ZEROTIER_ONE_VERSION_MAJOR);
diff --git a/node/NetworkConfig.cpp b/node/NetworkConfig.cpp
index fe4a5a0d..d906005e 100644
--- a/node/NetworkConfig.cpp
+++ b/node/NetworkConfig.cpp
@@ -23,9 +23,9 @@
namespace ZeroTier {
-bool NetworkConfig::toDictionary(Dictionary &d,bool includeLegacy) const
+bool NetworkConfig::toDictionary(Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d,bool includeLegacy) const
{
- Buffer<ZT_DICTIONARY_MAX_SIZE> tmp;
+ Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY> tmp;
d.clear();
@@ -259,11 +259,11 @@ bool NetworkConfig::toDictionary(Dictionary &d,bool includeLegacy) const
return true;
}
-bool NetworkConfig::fromDictionary(const Dictionary &d)
+bool NetworkConfig::fromDictionary(const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d)
{
try {
- Buffer<ZT_DICTIONARY_MAX_SIZE> tmp;
- char tmp2[ZT_DICTIONARY_MAX_SIZE];
+ Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY> tmp;
+ char tmp2[ZT_NETWORKCONFIG_DICT_CAPACITY];
memset(this,0,sizeof(NetworkConfig));
diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp
index 30d8c9fc..c137a2a5 100644
--- a/node/NetworkConfig.hpp
+++ b/node/NetworkConfig.hpp
@@ -64,6 +64,9 @@
namespace ZeroTier {
+// Maximum size of a network config dictionary (can be increased)
+#define ZT_NETWORKCONFIG_DICT_CAPACITY 8194
+
// Network config version
#define ZT_NETWORKCONFIG_VERSION 6
@@ -234,7 +237,7 @@ public:
* @param includeLegacy If true, include legacy fields for old node versions
* @return True if dictionary was successfully created, false if e.g. overflow
*/
- bool toDictionary(Dictionary &d,bool includeLegacy) const;
+ bool toDictionary(Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d,bool includeLegacy) const;
/**
* Read this network config from a dictionary
@@ -242,7 +245,7 @@ public:
* @param d Dictionary
* @return True if dictionary was valid and network config successfully initialized
*/
- bool fromDictionary(const Dictionary &d);
+ bool fromDictionary(const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d);
/**
* @return True if passive bridging is allowed (experimental)
diff --git a/node/NetworkController.hpp b/node/NetworkController.hpp
index b91ada1b..fa90fb75 100644
--- a/node/NetworkController.hpp
+++ b/node/NetworkController.hpp
@@ -22,12 +22,12 @@
#include <stdint.h>
#include "Constants.hpp"
+#include "Dictionary.hpp"
+#include "NetworkConfig.hpp"
namespace ZeroTier {
class RuntimeEnvironment;
-class NetworkConfig;
-class Dictionary;
class Identity;
class Address;
struct InetAddress;
@@ -75,7 +75,7 @@ public:
const Identity &signingId,
const Identity &identity,
uint64_t nwid,
- const Dictionary &metaData,
+ const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &metaData,
NetworkConfig &nc) = 0;
};
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-22 06:17:19 +0000