diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-08-16 14:14:56 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-08-16 14:14:56 -0700 |
| commit | 1387e15c1b585d6305606c91e7ce3c320e8aa760 (patch) | |
| tree | 484c92d087e150f8743aa46bafe60ed13229956f /service | |
| parent | 50e7ea088b16314c8ad9d10757204c966155f157 (diff) | |
| parent | 59b7cbb591b8f9ed4abfc25773619d6b1bebc4d2 (diff) | |
| download | infinitytier-1387e15c1b585d6305606c91e7ce3c320e8aa760.tar.gz infinitytier-1387e15c1b585d6305606c91e7ce3c320e8aa760.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/OneService.cpp | 4 | ||||
| -rw-r--r-- | service/OneService.hpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index ab3b8d73..c3bf9fee 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -99,8 +99,8 @@ namespace ZeroTier { typedef TestEthernetTap EthernetTap; } #include "../controller/EmbeddedNetworkController.hpp" #include "../node/Node.hpp" // Use the virtual netcon endpoint instead of a tun/tap port driver -#include "../src/SocketTap.hpp" -namespace ZeroTier { typedef SocketTap EthernetTap; } +#include "../src/VirtualTap.hpp" +namespace ZeroTier { typedef VirtualTap EthernetTap; } #else diff --git a/service/OneService.hpp b/service/OneService.hpp index 0d37ec63..b0467419 100644 --- a/service/OneService.hpp +++ b/service/OneService.hpp @@ -35,8 +35,8 @@ #ifdef ZT_SDK #include "../node/Node.hpp" // Use the virtual netcon endpoint instead of a tun/tap port driver -#include "../src/SocketTap.hpp" -namespace ZeroTier { typedef SocketTap EthernetTap; } +#include "../src/VirtualTap.hpp" +namespace ZeroTier { typedef VirtualTap EthernetTap; } #endif namespace ZeroTier { |