diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-20 15:12:31 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-20 15:12:31 -0700 |
| commit | 60f05518aab585213fd053b1f6d0c96646e8f44d (patch) | |
| tree | 62445eefff4ee00382c59ea10805c662a00317c0 /service | |
| parent | 740121504f2e9cb00ab0a97d277afd57db936633 (diff) | |
| download | infinitytier-60f05518aab585213fd053b1f6d0c96646e8f44d.tar.gz infinitytier-60f05518aab585213fd053b1f6d0c96646e8f44d.zip | |
(1) now builds and works on Linux, (2) fix a threading problem causing carsh on shutdown, (3) cleanup in selftest, re-enable Phy and Http tests.
Diffstat (limited to 'service')
| -rw-r--r-- | service/OneService.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 5ab66e72..5b0199ac 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -53,10 +53,15 @@ #include "OneService.hpp" #include "ControlPlane.hpp" +// Include the right tap device driver for this platform -- add new platforms here #ifdef __APPLE__ #include "../osdep/OSXEthernetTap.hpp" namespace ZeroTier { typedef OSXEthernetTap EthernetTap; } #endif +#ifdef __LINUX__ +#include "../osdep/LinuxEthernetTap.hpp" +namespace ZeroTier { typedef LinuxEthernetTap EthernetTap; } +#endif // Sanity limits for HTTP #define ZT_MAX_HTTP_MESSAGE_SIZE (1024 * 1024 * 8) |