summaryrefslogtreecommitdiff
path: root/node/NetworkConfig.hpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-08-09 13:14:38 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-08-09 13:14:38 -0700
commit4d498b3765695f1b82a2448f0e8efe698b33667d (patch)
tree191eb30f716498587808d1789e73d744137b1577 /node/NetworkConfig.hpp
parentbcd05fbdfa7e340ef4df962773bb7c32cf5013c2 (diff)
downloadinfinitytier-4d498b3765695f1b82a2448f0e8efe698b33667d.tar.gz
infinitytier-4d498b3765695f1b82a2448f0e8efe698b33667d.zip
Handling of multi-part chunked network configs on the inbound side.
Diffstat (limited to 'node/NetworkConfig.hpp')
-rw-r--r--node/NetworkConfig.hpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp
index 3682c466..18244ec9 100644
--- a/node/NetworkConfig.hpp
+++ b/node/NetworkConfig.hpp
@@ -38,6 +38,7 @@
#include "Capability.hpp"
#include "Tag.hpp"
#include "Dictionary.hpp"
+#include "Identity.hpp"
/**
* Flag: allow passive bridging (experimental)
@@ -239,10 +240,11 @@ public:
/**
* Read this network config from a dictionary
*
- * @param d Dictionary
+ * @param controllerId Controller identity for verification of any signature or NULL identity to skip
+ * @param d Dictionary (non-const since it might be modified during parse, should not be used after call)
* @return True if dictionary was valid and network config successfully initialized
*/
- bool fromDictionary(const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d);
+ bool fromDictionary(const Identity &controllerId,Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d);
/**
* @return True if passive bridging is allowed (experimental)