From 6369c264e2b54f7eb65a9f0f071ef7599ec7b20a Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 15 Apr 2015 15:12:09 -0700 Subject: Rename netconf to controller and NetworkConfigMaster to NetworkController for consistency. --- node/NetworkConfig.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'node/NetworkConfig.hpp') diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp index 31e47f41..02c5ba3f 100644 --- a/node/NetworkConfig.hpp +++ b/node/NetworkConfig.hpp @@ -68,9 +68,9 @@ namespace ZeroTier { #define ZT_NETWORKCONFIG_DICT_KEY_RELAYS "rl" /** - * Network configuration received from netconf master nodes + * Network configuration received from network controller nodes * - * This is an immutable value object created from a dictionary received from netconf master. + * This is an immutable value object created from a dictionary received from controller. */ class NetworkConfig { @@ -102,10 +102,10 @@ public: * Create an instance of a NetworkConfig for the test network ID * * The test network ID is defined as ZT_TEST_NETWORK_ID. This is a - * "fake" network with no real netconf master and default options. + * "fake" network with no real controller and default options. * * @param self This node's ZT address - * @return Configured instance of netconf for test network ID + * @return Configuration for test network ID */ static SharedPtr createTestNetworkConfig(const Address &self); -- cgit v1.2.3