dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into edge

Browse source
This commit is contained in:
Adam Ierymenko 2017-11-07 14:59:18 -08:00
commit cb550ab4fe
2 changed files with 8 additions and 8 deletions
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 "../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
@ -920,14 +920,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()