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 /selftest.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 'selftest.cpp')
| -rw-r--r-- | selftest.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/selftest.cpp b/selftest.cpp index 465e0088..8c8c6fa1 100644 --- a/selftest.cpp +++ b/selftest.cpp @@ -59,9 +59,9 @@ #include "osdep/Phy.hpp" #endif -#ifdef ZT_ENABLE_NETCONF_MASTER -#include "netconf/SqliteNetworkConfigMaster.hpp" -#endif // ZT_ENABLE_NETCONF_MASTER +#ifdef ZT_ENABLE_NETWORK_CONTROLLER +#include "controller/SqliteNetworkController.hpp" +#endif // ZT_ENABLE_NETWORK_CONTROLLER #ifdef __WINDOWS__ #include <tchar.h> @@ -726,14 +726,14 @@ static int testPhy() static int testSqliteNetconfMaster() { -#ifdef ZT_ENABLE_NETCONF_MASTER +#ifdef ZT_ENABLE_NETWORK_CONTROLLER try { - std::cout << "[netconf] Generating signing identity..." << std::endl; + std::cout << "[network-controller] Generating signing identity..." << std::endl; Identity signingId; signingId.generate(); - std::cout << "[netconf] Creating database..." << std::endl; - SqliteNetworkConfigMaster netconf(signingId,"netconf-test.db"); + std::cout << "[network-controller] Creating database..." << std::endl; + SqliteNetworkController controller(signingId,"network-controller-test.db"); } catch (std::runtime_error &exc) { std::cout << "FAIL! (unexpected exception: " << exc.what() << ")" << std::endl; return -1; @@ -741,7 +741,7 @@ static int testSqliteNetconfMaster() std::cout << "FAIL! (unexpected exception: ...)" << std::endl; return -1; } -#endif // ZT_ENABLE_NETCONF_MASTER +#endif // ZT_ENABLE_NETWORK_CONTROLLER return 0; } |