diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-09 19:58:04 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-09 19:58:04 -0700 |
| commit | 38200cc6a55c3b11502a78251c2bdf09960a2a03 (patch) | |
| tree | 71731aa9dff009f769a53c9f1fd5c1a6ee4f74c5 /osdep | |
| parent | 6615a70027003a3896e51f713b109839dea03bfc (diff) | |
| download | infinitytier-38200cc6a55c3b11502a78251c2bdf09960a2a03.tar.gz infinitytier-38200cc6a55c3b11502a78251c2bdf09960a2a03.zip | |
Add data store functions to service/One, and shelve old main.cpp since it will get rebuilt.
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/OSUtils.cpp | 34 | ||||
| -rw-r--r-- | osdep/Phy.hpp | 3 |
2 files changed, 1 insertions, 36 deletions
diff --git a/osdep/OSUtils.cpp b/osdep/OSUtils.cpp index e0e8ca3d..f98f7e03 100644 --- a/osdep/OSUtils.cpp +++ b/osdep/OSUtils.cpp @@ -51,40 +51,6 @@ namespace ZeroTier { -static inline std::string _mkDefaultHomePath() -{ -#ifdef __UNIX_LIKE__ - -#ifdef __APPLE__ - // /Library/... on Apple - return std::string("/Library/Application Support/ZeroTier/One"); -#else - -#ifdef __FreeBSD__ - // FreeBSD likes /var/db instead of /var/lib - return std::string("/var/db/zerotier-one"); -#else - // Use /var/lib for Linux and other *nix - return std::string("/var/lib/zerotier-one"); -#endif - -#endif - -#else // not __UNIX_LIKE__ - -#ifdef __WINDOWS__ - // Look up app data folder on Windows, e.g. C:\ProgramData\... - char buf[16384]; - if (SUCCEEDED(SHGetFolderPathA(NULL,CSIDL_COMMON_APPDATA,NULL,0,buf))) - return (std::string(buf) + "\\ZeroTier\\One"); - else return std::string("C:\\ZeroTier\\One"); -#else -#error Unknown platform, please define a default home path! -#endif - -#endif // __UNIX_LIKE__ or not... -} - #ifdef __UNIX_LIKE__ bool OSUtils::redirectUnixOutputs(const char *stdoutPath,const char *stderrPath) throw() diff --git a/osdep/Phy.hpp b/osdep/Phy.hpp index 688514f6..1b55e0a6 100644 --- a/osdep/Phy.hpp +++ b/osdep/Phy.hpp @@ -178,8 +178,7 @@ public: ON_TCP_CLOSE_FUNCTION tcpCloseHandler, ON_TCP_DATA_FUNCTION tcpDataHandler, ON_TCP_WRITABLE_FUNCTION tcpWritableHandler, - bool noDelay - ) : + bool noDelay) : _datagramHandler(datagramHandler), _tcpConnectHandler(tcpConnectHandler), _tcpAcceptHandler(tcpAcceptHandler), |