diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-15 15:12:09 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-15 15:12:09 -0700 |
| commit | 6369c264e2b54f7eb65a9f0f071ef7599ec7b20a (patch) | |
| tree | b2570a21eb6d02040256d8a84855361da8c19e75 /node/NetworkConfig.cpp | |
| parent | 871473255b7b0c5ad6507f0fe62ca6998a41f678 (diff) | |
| download | infinitytier-6369c264e2b54f7eb65a9f0f071ef7599ec7b20a.tar.gz infinitytier-6369c264e2b54f7eb65a9f0f071ef7599ec7b20a.zip | |
Rename netconf to controller and NetworkConfigMaster to NetworkController for consistency.
Diffstat (limited to 'node/NetworkConfig.cpp')
| -rw-r--r-- | node/NetworkConfig.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node/NetworkConfig.cpp b/node/NetworkConfig.cpp index a034b15f..6cab4b41 100644 --- a/node/NetworkConfig.cpp +++ b/node/NetworkConfig.cpp @@ -109,7 +109,7 @@ void NetworkConfig::_fromDictionary(const Dictionary &d) throw std::invalid_argument("configuration contains zero network ID"); _timestamp = Utils::hexStrToU64(d.get(ZT_NETWORKCONFIG_DICT_KEY_TIMESTAMP).c_str()); - _revision = Utils::hexStrToU64(d.get(ZT_NETWORKCONFIG_DICT_KEY_REVISION,"1").c_str()); // older netconf masters don't send this, so default to 1 + _revision = Utils::hexStrToU64(d.get(ZT_NETWORKCONFIG_DICT_KEY_REVISION,"1").c_str()); // older controllers don't send this, so default to 1 memset(_etWhitelist,0,sizeof(_etWhitelist)); std::vector<std::string> ets(Utils::split(d.get(ZT_NETWORKCONFIG_DICT_KEY_ALLOWED_ETHERNET_TYPES).c_str(),",","","")); |