summaryrefslogtreecommitdiff
path: root/service/OneService.cpp
diff options
context:
space:
mode:
authorJoseph Henry <josephjah@gmail.com>2017-11-06 13:43:56 -0800
committerJoseph Henry <josephjah@gmail.com>2017-11-06 13:43:56 -0800
commite5d1243dd225526b044d36b15dd28a74c49a8816 (patch)
tree4d9d4f30a8f4d97d0785635bf832cfc5ca6b1dc1 /service/OneService.cpp
parenta6203ed0389c1b995ebe94935b2d1ddeb01f36ee (diff)
downloadinfinitytier-e5d1243dd225526b044d36b15dd28a74c49a8816.tar.gz
infinitytier-e5d1243dd225526b044d36b15dd28a74c49a8816.zip
Minor changes to SDK-related portions of OneService
Diffstat (limited to 'service/OneService.cpp')
-rw-r--r--service/OneService.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp
index e962fb5b..8081d00a 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -99,7 +99,7 @@ namespace ZeroTier { typedef TestEthernetTap EthernetTap; }
#include "../controller/EmbeddedNetworkController.hpp"
#include "../node/Node.hpp"
// Use the virtual netcon endpoint instead of a tun/tap port driver
-#include "../src/VirtualTap.hpp"
+#include "../include/VirtualTap.h"
namespace ZeroTier { typedef VirtualTap EthernetTap; }
#else
@@ -916,14 +916,14 @@ public:
}
#ifdef ZT_SDK
- virtual void leave(const char *hp)
+ virtual void leave(const uint64_t hp)
{
- _node->leave(Utils::hexStrToU64(hp),NULL,NULL);
+ _node->leave(hp, NULL, NULL);
}
- virtual void join(const char *hp)
+ virtual void join(const uint64_t hp)
{
- _node->join(Utils::hexStrToU64(hp),NULL,NULL);
+ _node->join(hp, NULL, NULL);
}
virtual std::string givenHomePath()