github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-21 13:54:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev

Browse source
This commit is contained in:
Joseph Henry 2018-01-10 12:43:18 -08:00
commit 6e1823ac81
46 changed files with 106 additions and 3377 deletions
Download patch file Download diff file Expand all files Collapse all files

3
osdep/TestEthernetTap.hpp
View file

@ -43,6 +43,7 @@
#include "../node/MulticastGroup.hpp"
#include "../node/Mutex.hpp"
#include "../node/Utils.hpp"
#include "../osdep/OSUtils.hpp"
namespace ZeroTier {
@ -66,7 +67,7 @@ public:
_enabled(true)
{
char tmp[32];
Utils::snprintf(tmp,sizeof(tmp),"%.16llx",(unsigned long long)_nwid);
OSUtils::ztsnprintf(tmp,sizeof(tmp),"%.16llx",(unsigned long long)_nwid);
_dev.append(tmp);
#ifdef ZT_TEST_TAP_REPORT_TO
_reportTo.fromString(ZT_TEST_TAP_REPORT_TO);