From 60f05518aab585213fd053b1f6d0c96646e8f44d Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Mon, 20 Apr 2015 15:12:31 -0700
Subject: (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.

---
 service/OneService.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'service')

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)
-- 
cgit v1.2.3