void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Adam Ierymenko 2017-11-07 14:59:03 -08:00
commit b8cbf08617
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
service/OneService.cpp
View file

@ -99,7 +99,7 @@ namespace ZeroTier { typedef TestEthernetTap EthernetTap; }
#include "../controller/EmbeddedNetworkController.hpp" #include "../controller/EmbeddedNetworkController.hpp"
#include "../node/Node.hpp" #include "../node/Node.hpp"
// Use the virtual netcon endpoint instead of a tun/tap port driver // 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; } namespace ZeroTier { typedef VirtualTap EthernetTap; }
#else #else
@ -916,14 +916,14 @@ public:
} }
#ifdef ZT_SDK #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() virtual std::string givenHomePath()

6
service/OneService.hpp
View file

@ -35,7 +35,7 @@
#ifdef ZT_SDK #ifdef ZT_SDK
#include "../node/Node.hpp" #include "../node/Node.hpp"
// Use the virtual netcon endpoint instead of a tun/tap port driver // 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; } namespace ZeroTier { typedef VirtualTap EthernetTap; }
#endif #endif
@ -147,8 +147,8 @@ public:
virtual std::string portDeviceName(uint64_t nwid) const = 0; virtual std::string portDeviceName(uint64_t nwid) const = 0;
#ifdef ZT_SDK #ifdef ZT_SDK
virtual void leave(const char *hp) = 0; virtual void leave(const uint64_t hp) = 0;
virtual void join(const char *hp) = 0; virtual void join(const uint64_t hp) = 0;
virtual std::string givenHomePath() = 0; virtual std::string givenHomePath() = 0;
virtual Node * getNode() = 0; virtual Node * getNode() = 0;
virtual void removeNets() = 0; virtual void removeNets() = 0;