summaryrefslogtreecommitdiff
path: root/osdep
diff options
context:
space:
mode:
authorJoseph Henry <josephjah@gmail.com>2018-01-10 12:43:18 -0800
committerJoseph Henry <josephjah@gmail.com>2018-01-10 12:43:18 -0800
commit6e1823ac8156b39f68b0cbba1d350f4bdc149231 (patch)
tree38a0f46da441957299ccb10cdf9e456be955de22 /osdep
parent640cc22749276e7c7f6e7cfa4eee8c0590064ac0 (diff)
parent9bab49d2f91fbb1d19c75e868bc04959ef9f135e (diff)
downloadinfinitytier-6e1823ac8156b39f68b0cbba1d350f4bdc149231.tar.gz
infinitytier-6e1823ac8156b39f68b0cbba1d350f4bdc149231.zip
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'osdep')
-rw-r--r--osdep/TestEthernetTap.hpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/osdep/TestEthernetTap.hpp b/osdep/TestEthernetTap.hpp
index 2f73258a..6ccf92f3 100644
--- a/osdep/TestEthernetTap.hpp
+++ b/osdep/TestEthernetTap.hpp
@@ -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);