From e3b04fc8673945a21d7137779d3f8aa3ed867430 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Thu, 11 Aug 2016 12:14:04 -0700 Subject: [PATCH] ifdef fix for service API exposed to SDK --- zerotierone/service/OneService.cpp | 5 +++++ zerotierone/service/OneService.hpp | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/zerotierone/service/OneService.cpp b/zerotierone/service/OneService.cpp index d597f0c..405b3ff 100755 --- a/zerotierone/service/OneService.cpp +++ b/zerotierone/service/OneService.cpp @@ -973,6 +973,11 @@ public: return _taps; } + virtual Node * getNode() + { + return _node; + } + // Begin private implementation methods inline void phyOnDatagram(PhySocket *sock,void **uptr,const struct sockaddr *localAddr,const struct sockaddr *from,void *data,unsigned long len) diff --git a/zerotierone/service/OneService.hpp b/zerotierone/service/OneService.hpp index 1aa2002..56dec8a 100755 --- a/zerotierone/service/OneService.hpp +++ b/zerotierone/service/OneService.hpp @@ -22,6 +22,8 @@ #include #include +#include "../node/Node.hpp" + // Include the right tap device driver for this platform -- add new platforms here #ifdef SDK // In network containers builds, use the virtual netcon endpoint instead of a tun/tap port driver @@ -138,6 +140,7 @@ public: */ virtual void terminate() = 0; +#ifdef SDK /** * Joins a network */ @@ -159,10 +162,16 @@ public: */ virtual std::map< uint64_t,EthernetTap * > getTaps() = 0; + /* + * + */ + virtual Node * getNode() = 0; + /** * @return True if service is still running */ inline bool isRunning() const { return (this->reasonForTermination() == ONE_STILL_RUNNING); } +#endif protected: OneService() {}