diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-10-29 23:57:54 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-10-29 23:57:54 -0700 |
| commit | 5ca20da7afacb6a79c448c5bfb1e2bcd057f0f70 (patch) | |
| tree | 0e22337c827df9e46acb591db8ab583d6941c02a /windows | |
| parent | 8bd9f7d51dbb8756d7063cc7cb3939ff74104145 (diff) | |
| download | infinitytier-5ca20da7afacb6a79c448c5bfb1e2bcd057f0f70.tar.gz infinitytier-5ca20da7afacb6a79c448c5bfb1e2bcd057f0f70.zip | |
Windows service fix -- it helps if we actually launch the control socket thing.
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOneService.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/windows/ZeroTierOne/ZeroTierOneService.cpp b/windows/ZeroTierOne/ZeroTierOneService.cpp index a33a30e1..de57c81a 100644 --- a/windows/ZeroTierOne/ZeroTierOneService.cpp +++ b/windows/ZeroTierOne/ZeroTierOneService.cpp @@ -37,6 +37,9 @@ #include "../../node/Defaults.hpp" #include "../../node/Utils.hpp" +#include "../../control/NodeControlClient.hpp" +#include "../../control/NodeControlService.hpp" + #include "../../osnet/WindowsEthernetTapFactory.hpp" #include "../../osnet/WindowsRoutingTable.hpp" #include "../../osnet/NativeSocketManager.hpp" @@ -83,6 +86,8 @@ void ZeroTierOneService::threadMain() restart_node: try { + std::string authToken(ZeroTier::NodeControlClient::getAuthToken((ZeroTier::ZT_DEFAULTS.defaultHomePath + ZT_PATH_SEPARATOR_S + "authtoken.secret").c_str(),true)); + ZeroTier::WindowsEthernetTapFactory tapFactory(ZeroTier::ZT_DEFAULTS.defaultHomePath.c_str()); ZeroTier::WindowsRoutingTable routingTable; ZeroTier::NativeSocketManager socketManager(ZT_DEFAULT_UDP_PORT,0); @@ -94,6 +99,8 @@ restart_node: _node = new ZeroTier::Node(ZeroTier::ZT_DEFAULTS.defaultHomePath.c_str(),&tapFactory,&routingTable,&socketManager,false,(const char *)0); } + ZeroTier::NodeControlService controlService(_node,authToken.c_str()); + switch(_node->run()) { case ZeroTier::Node::NODE_RESTART_FOR_UPGRADE: { |