ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-19 04:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add SDK VirtualTap to new factory method

Browse Source
This commit is contained in:
Adam Ierymenko 2019-08-07 18:45:04 -05:00
parent 7436f85ad0
commit b11627a8bc
No known key found for this signature in database
GPG Key ID: 1657198823E52A61
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osdep/EthernetTap.cpp
View File

@ -31,7 +31,6 @@
#include <string.h> #include <string.h>
#ifdef __APPLE__ #ifdef __APPLE__
#include <errno.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include "MacEthernetTap.hpp" #include "MacEthernetTap.hpp"
#include "MacKextEthernetTap.hpp" #include "MacKextEthernetTap.hpp"
@ -57,6 +56,12 @@
#include "BSDEthernetTap.hpp" #include "BSDEthernetTap.hpp"
#endif // __OpenBSD__ #endif // __OpenBSD__
#ifdef ZT_SDK
#include "../controller/EmbeddedNetworkController.hpp"
#include "../node/Node.hpp"
#include "../include/VirtualTap.hpp"
#endif
namespace ZeroTier { namespace ZeroTier {
std::shared_ptr<EthernetTap> EthernetTap::newInstance( 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 (*handler)(void *,void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
void *arg) 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__ #ifdef __APPLE__
char osrelease[256]; char osrelease[256];
size_t size = sizeof(osrelease); size_t size = sizeof(osrelease);
@ -77,6 +87,7 @@ std::shared_ptr<EthernetTap> EthernetTap::newInstance(
char *dotAt = strchr(osrelease,'.'); char *dotAt = strchr(osrelease,'.');
if (dotAt) { if (dotAt) {
*dotAt = (char)0; *dotAt = (char)0;
printf("%s\n",osrelease);
// The "feth" virtual Ethernet device type appeared in Darwin 17.x.x. Older versions // The "feth" virtual Ethernet device type appeared in Darwin 17.x.x. Older versions
// (Sierra and earlier) must use the a kernel extension. // (Sierra and earlier) must use the a kernel extension.
if (strtol(osrelease,(char **)0,10) < 17) { 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)); return std::shared_ptr<EthernetTap>(new BSDEthernetTap(homePath,mac,mtu,metric,nwid,friendlyName,handler,arg));
#endif // __OpenBSD__ #endif // __OpenBSD__
#endif // ZT_SDK?
return std::shared_ptr<EthernetTap>(); return std::shared_ptr<EthernetTap>();
} }

22
service/OneService.cpp
View File

@ -100,30 +100,8 @@ using json = nlohmann::json;
#include "../controller/EmbeddedNetworkController.hpp" #include "../controller/EmbeddedNetworkController.hpp"
#include "../controller/RabbitMQ.hpp" #include "../controller/RabbitMQ.hpp"
#ifdef ZT_USE_TEST_TAP
#include "../osdep/TestEthernetTap.hpp"
namespace ZeroTier { typedef TestEthernetTap EthernetTap; }
#else
#ifdef ZT_SDK
#include "../controller/EmbeddedNetworkController.hpp"
#include "../node/Node.hpp"
// Use the virtual netcon endpoint instead of a tun/tap port driver
#include "../include/VirtualTap.hpp"
namespace ZeroTier { typedef VirtualTap EthernetTap; }
#else
#include "../osdep/EthernetTap.hpp" #include "../osdep/EthernetTap.hpp"
#endif // ZT_SDK
#endif // ZT_USE_TEST_TAP
#ifndef ZT_SOFTWARE_UPDATE_DEFAULT #ifndef ZT_SOFTWARE_UPDATE_DEFAULT
#define ZT_SOFTWARE_UPDATE_DEFAULT "disable" #define ZT_SOFTWARE_UPDATE_DEFAULT "disable"
#endif #endif