diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-16 14:35:35 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-16 14:35:35 -0700 |
| commit | d0935f667fd809a32cb4184a2c422ff79dc6d933 (patch) | |
| tree | 8dd92dfbe2fdd30375993a21619f701d48060340 /service/OneService.cpp | |
| parent | 4a0280686c7a74b58a060375ffce385554d90040 (diff) | |
| parent | 38243e5eff71b76d35904afffd2b21fe84ed958a (diff) | |
| download | infinitytier-d0935f667fd809a32cb4184a2c422ff79dc6d933.tar.gz infinitytier-d0935f667fd809a32cb4184a2c422ff79dc6d933.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'service/OneService.cpp')
| -rw-r--r-- | service/OneService.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 56b1d979..99aaf77d 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -70,6 +70,10 @@ namespace ZeroTier { typedef LinuxEthernetTap EthernetTap; } #include "../osdep/WindowsEthernetTap.hpp" namespace ZeroTier { typedef WindowsEthernetTap EthernetTap; } #endif +#if defined(__BSD__) && (!defined(__APPLE__)) +#include "../osdep/BSDEthernetTap.hpp" +namespace ZeroTier { typedef BSDEthernetTap EthernetTap; } +#endif // Sanity limits for HTTP #define ZT_MAX_HTTP_MESSAGE_SIZE (1024 * 1024 * 8) |