diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2013-08-12 16:57:34 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2013-08-12 16:57:34 -0400 |
| commit | 5076c75b079fe02c843ca85dc20821e468b2d7b8 (patch) | |
| tree | 0483b8122b9e627b1237e6d8e63e1c48c31497ee /node/SysEnv.cpp | |
| parent | 36af3d92ecb4148a74c14896f5b6a9dcea0c1700 (diff) | |
| download | infinitytier-5076c75b079fe02c843ca85dc20821e468b2d7b8.tar.gz infinitytier-5076c75b079fe02c843ca85dc20821e468b2d7b8.zip | |
More Windows port work.
Diffstat (limited to 'node/SysEnv.cpp')
| -rw-r--r-- | node/SysEnv.cpp | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/node/SysEnv.cpp b/node/SysEnv.cpp index 016e9caa..20b8e7d1 100644 --- a/node/SysEnv.cpp +++ b/node/SysEnv.cpp @@ -30,17 +30,23 @@ #include <string.h> #include <fcntl.h> #include <errno.h> -#include <sys/socket.h> #include <sys/types.h> -#include <arpa/inet.h> #include <set> #include <string> +#include "Constants.hpp" #include "SysEnv.hpp" #include "Utils.hpp" #include "RuntimeEnvironment.hpp" #include "NodeConfig.hpp" +#ifdef __UNIX_LIKE__ +#include <arpa/inet.h> +#include <sys/socket.h> +#include <unistd.h> +#include <signal.h> +#endif + #ifdef __APPLE__ #include <sys/sysctl.h> #include <sys/uio.h> @@ -48,11 +54,9 @@ #include <net/route.h> #endif -#ifdef _WIN32 +#ifdef __WINDOWS__ #include <Windows.h> -#else -#include <unistd.h> -#include <signal.h> +#include <WinSock2.h> #endif namespace ZeroTier { @@ -210,10 +214,15 @@ uint64_t SysEnv::getNetworkConfigurationFingerprint() #endif // __linux__ -#ifdef _WIN32 +#ifdef __WINDOWS__ -not implemented yet; +uint64_t SysEnv::getNetworkConfigurationFingerprint() + throw() +{ + // TODO: windows version + return 1; +} -#endif // _WIN32 +#endif // __WINDOWS__ } // namespace ZeroTier |