diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-08-07 18:45:04 -0500 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-08-07 18:45:04 -0500 |
| commit | b11627a8bc37a51455538f45484f3eae1ce195de (patch) | |
| tree | 2f9ded5aecfd0a5f77d55e04ca6e0db732e7e333 /osdep | |
| parent | 7436f85ad087732a79cf1b99c5448187401c6da3 (diff) | |
| download | infinitytier-b11627a8bc37a51455538f45484f3eae1ce195de.tar.gz infinitytier-b11627a8bc37a51455538f45484f3eae1ce195de.zip | |
add SDK VirtualTap to new factory method
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/EthernetTap.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/osdep/EthernetTap.cpp b/osdep/EthernetTap.cpp index a10db55f..21618a58 100644 --- a/osdep/EthernetTap.cpp +++ b/osdep/EthernetTap.cpp @@ -31,7 +31,6 @@ #include <string.h> #ifdef __APPLE__ -#include <errno.h> #include <sys/sysctl.h> #include "MacEthernetTap.hpp" #include "MacKextEthernetTap.hpp" @@ -57,6 +56,12 @@ #include "BSDEthernetTap.hpp" #endif // __OpenBSD__ +#ifdef ZT_SDK +#include "../controller/EmbeddedNetworkController.hpp" +#include "../node/Node.hpp" +#include "../include/VirtualTap.hpp" +#endif + namespace ZeroTier { std::shared_ptr<EthernetTap> EthernetTap::newInstance( @@ -70,6 +75,11 @@ std::shared_ptr<EthernetTap> EthernetTap::newInstance( void (*handler)(void *,void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int), void *arg) { + +#ifdef ZT_SDK + return std::shared_ptr<EthernetTap>(new VirtualTap(homePath,mac,mtu,metric,nwid,friendlyName,handler,arg)); +#else // not ZT_SDK + #ifdef __APPLE__ char osrelease[256]; size_t size = sizeof(osrelease); @@ -77,6 +87,7 @@ std::shared_ptr<EthernetTap> EthernetTap::newInstance( char *dotAt = strchr(osrelease,'.'); if (dotAt) { *dotAt = (char)0; + printf("%s\n",osrelease); // The "feth" virtual Ethernet device type appeared in Darwin 17.x.x. Older versions // (Sierra and earlier) must use the a kernel extension. if (strtol(osrelease,(char **)0,10) < 17) { @@ -108,6 +119,8 @@ std::shared_ptr<EthernetTap> EthernetTap::newInstance( return std::shared_ptr<EthernetTap>(new BSDEthernetTap(homePath,mac,mtu,metric,nwid,friendlyName,handler,arg)); #endif // __OpenBSD__ +#endif // ZT_SDK? + return std::shared_ptr<EthernetTap>(); } |