diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-08-07 21:47:06 -0500 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-08-07 21:47:06 -0500 |
| commit | c83a4aef552bfa081e415eb55a05f8c59d5f17d4 (patch) | |
| tree | d3118e36e31e3392629df0933ebdffc4eae5195f | |
| parent | af7a70bf022a04654eb4c46fa658ef66e9d86a93 (diff) | |
| download | infinitytier-c83a4aef552bfa081e415eb55a05f8c59d5f17d4.tar.gz infinitytier-c83a4aef552bfa081e415eb55a05f8c59d5f17d4.zip | |
cleanup
| -rw-r--r-- | osdep/EthernetTap.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/osdep/EthernetTap.cpp b/osdep/EthernetTap.cpp index c3bb4ca1..82290fc2 100644 --- a/osdep/EthernetTap.cpp +++ b/osdep/EthernetTap.cpp @@ -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__ |