diff options
Diffstat (limited to 'service/OneService.cpp')
| -rw-r--r-- | service/OneService.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 33fb26ac..c3204b5d 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -92,22 +92,37 @@ class SqliteNetworkController; #endif // Include the right tap device driver for this platform -- add new platforms here +#ifdef ZT_ENABLE_NETCON + +#include "../netcon/NetconEthernetTap.hpp" +namespace ZeroTier { typedef NetconEthernetTap EthernetTap; } + +#else #ifdef __APPLE__ + #include "../osdep/OSXEthernetTap.hpp" namespace ZeroTier { typedef OSXEthernetTap EthernetTap; } + #endif #ifdef __LINUX__ + #include "../osdep/LinuxEthernetTap.hpp" namespace ZeroTier { typedef LinuxEthernetTap EthernetTap; } + #endif #ifdef __WINDOWS__ + #include "../osdep/WindowsEthernetTap.hpp" namespace ZeroTier { typedef WindowsEthernetTap EthernetTap; } + #endif #ifdef __FreeBSD__ + #include "../osdep/BSDEthernetTap.hpp" namespace ZeroTier { typedef BSDEthernetTap EthernetTap; } + #endif +#endif // ZT_ENABLE_NETCON // Sanity limits for HTTP #define ZT_MAX_HTTP_MESSAGE_SIZE (1024 * 1024 * 64) @@ -117,7 +132,7 @@ namespace ZeroTier { typedef BSDEthernetTap EthernetTap; } #define ZT_IF_METRIC 32768 // How often to check for new multicast subscriptions on a tap device -#define ZT_TAP_CHECK_MULTICAST_INTERVAL 30000 +#define ZT_TAP_CHECK_MULTICAST_INTERVAL 5000 // Path under ZT1 home for controller database if controller is enabled #define ZT_CONTROLLER_DB_PATH "controller.db" @@ -1116,11 +1131,11 @@ public: } } + inline void phyOnFileDescriptorActivity(PhySocket *sock,void **uptr,bool readable,bool writable) {} inline void phyOnUnixAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN) {} inline void phyOnUnixClose(PhySocket *sock,void **uptr) {} inline void phyOnUnixData(PhySocket *sock,void **uptr,void *data,unsigned long len) {} inline void phyOnUnixWritable(PhySocket *sock,void **uptr) {} - inline void phyOnFileDescriptorActivity(PhySocket *sock,void **uptr,bool readable,bool writable) {} inline int nodeVirtualNetworkConfigFunction(uint64_t nwid,enum ZT_VirtualNetworkConfigOperation op,const ZT_VirtualNetworkConfig *nwc) { |