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' into edge

Browse source
This commit is contained in:
Adam Ierymenko 2019-08-07 22:35:27 -05:00
commit 14c8564893
No known key found for this signature in database
GPG key ID: 1657198823E52A61
2 changed files with 34 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
osdep/EthernetTap.cpp
View file

@ -30,6 +30,14 @@
#include <stdlib.h>
#include <string.h>
#ifdef ZT_SDK
#include "../controller/EmbeddedNetworkController.hpp"
#include "../node/Node.hpp"
#include "../include/VirtualTap.hpp"
#else
#ifdef __APPLE__
#include <sys/sysctl.h>
#include "MacEthernetTap.hpp"
@ -56,10 +64,6 @@
#include "BSDEthernetTap.hpp"
#endif // __OpenBSD__
#ifdef ZT_SDK
#include "../controller/EmbeddedNetworkController.hpp"
#include "../node/Node.hpp"
#include "../include/VirtualTap.hpp"
#endif
namespace ZeroTier {
@ -77,7 +81,9 @@ std::shared_ptr<EthernetTap> EthernetTap::newInstance(
{
#ifdef ZT_SDK
return std::shared_ptr<EthernetTap>(new VirtualTap(homePath,mac,mtu,metric,nwid,friendlyName,handler,arg));
#else // not ZT_SDK
#ifdef __APPLE__