diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-10-06 15:56:18 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-10-06 15:56:18 -0700 |
| commit | 7394ec6f6ab38c48e84edf3bf2fdb46e6966fa35 (patch) | |
| tree | fe93e7aab1ccfffaa9299452b2b395b4e1723367 /service | |
| parent | 3593fb3462f277cca9241563ac0b97ade1582c91 (diff) | |
| download | infinitytier-7394ec6f6ab38c48e84edf3bf2fdb46e6966fa35.tar.gz infinitytier-7394ec6f6ab38c48e84edf3bf2fdb46e6966fa35.zip | |
Prep in controller code to run tests.
Diffstat (limited to 'service')
| -rw-r--r-- | service/OneService.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 4b374cd7..071a2cbc 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -422,7 +422,7 @@ public: _homePath((hp) ? hp : "."), _tcpFallbackResolver(ZT_TCP_FALLBACK_RELAY), #ifdef ZT_ENABLE_NETWORK_CONTROLLER - _controller((_homePath + ZT_PATH_SEPARATOR_S + ZT_CONTROLLER_DB_PATH).c_str()), + _controller((SqliteNetworkController *)0), #endif _phy(this,false,true), _overrideRootTopology((overrideRootTopology) ? overrideRootTopology : ""), @@ -515,6 +515,9 @@ public: _phy.close(_v4UpnpUdpSocket); delete _upnpClient; #endif +#ifdef ZT_ENABLE_NETWORK_CONTROLLER + delete _controller; +#endif } virtual ReasonForTermination run() @@ -551,14 +554,15 @@ public: ((_overrideRootTopology.length() > 0) ? _overrideRootTopology.c_str() : (const char *)0)); #ifdef ZT_ENABLE_NETWORK_CONTROLLER - _node->setNetconfMaster((void *)&_controller); + _controller = new SqliteNetworkController(_node,(_homePath + ZT_PATH_SEPARATOR_S + ZT_CONTROLLER_DB_PATH).c_str(),(_homePath + ZT_PATH_SEPARATOR_S + "circuitTestResults.d").c_str()); + _node->setNetconfMaster((void *)_controller); #endif _controlPlane = new ControlPlane(this,_node,(_homePath + ZT_PATH_SEPARATOR_S + "ui").c_str()); _controlPlane->addAuthToken(authToken.c_str()); #ifdef ZT_ENABLE_NETWORK_CONTROLLER - _controlPlane->setController(&_controller); + _controlPlane->setController(_controller); #endif { // Remember networks from previous session @@ -1322,7 +1326,7 @@ private: const std::string _homePath; BackgroundResolver _tcpFallbackResolver; #ifdef ZT_ENABLE_NETWORK_CONTROLLER - SqliteNetworkController _controller; + SqliteNetworkController *_controller; #endif Phy<OneServiceImpl *> _phy; std::string _overrideRootTopology; |