ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-21 10:01:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into zeroidc

Browse Source
This commit is contained in:
Grant Limberg 2022-01-05 08:35:15 -08:00
commit dceba1f2f1
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
18 changed files with 38 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ZeroTierOne.h
View File

@ -23,9 +23,9 @@
// For the struct sockaddr_storage structure // For the struct sockaddr_storage structure
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <WinSock2.h> #include <winsock2.h>
#include <WS2tcpip.h> #include <ws2tcpip.h>
#include <Windows.h> #include <windows.h>
#else /* not Windows */ #else /* not Windows */
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <netinet/in.h>

4
node/Constants.hpp
View File

@ -92,8 +92,8 @@
#pragma warning(disable : 4101) #pragma warning(disable : 4101)
#undef __UNIX_LIKE__ #undef __UNIX_LIKE__
#undef __BSD__ #undef __BSD__
#include <WinSock2.h> #include <winsock2.h>
#include <Windows.h> #include <windows.h>
#endif #endif
#ifdef __NetBSD__ #ifdef __NetBSD__

2
node/Mutex.hpp
View File

@ -86,7 +86,7 @@ private:
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#include <stdlib.h> #include <stdlib.h>
#include <Windows.h> #include <windows.h>
namespace ZeroTier { namespace ZeroTier {

2
node/Salsa20.hpp
View File

@ -15,7 +15,7 @@
#include "Constants.hpp" #include "Constants.hpp"
#include "Utils.hpp" #include "Utils.hpp"
#if (!defined(ZT_SALSA20_SSE)) && (defined(__SSE2__) || defined(__WINDOWS__)) #if (!defined(ZT_SALSA20_SSE)) && (defined(__SSE2__) || (defined(__WINDOWS__) && !defined(__MINGW32__)))
#define ZT_SALSA20_SSE 1 #define ZT_SALSA20_SSE 1
#endif #endif

4
one.cpp
View File

@ -25,8 +25,8 @@
#include "node/Constants.hpp" #include "node/Constants.hpp"
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#include <WinSock2.h> #include <winsock2.h>
#include <Windows.h> #include <windows.h>
#include <tchar.h> #include <tchar.h>
#include <wchar.h> #include <wchar.h>
#include <lmcons.h> #include <lmcons.h>

6
osdep/Binder.hpp
View File

@ -22,9 +22,9 @@
#include <string.h> #include <string.h>
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#include <ShlObj.h> #include <shlobj.h>
#include <WinSock2.h> #include <winsock2.h>
#include <Windows.h> #include <windows.h>
#include <iphlpapi.h> #include <iphlpapi.h>
#include <netioapi.h> #include <netioapi.h>
#else #else

6
osdep/Http.hpp
View File

@ -19,9 +19,9 @@
#include <stdexcept> #include <stdexcept>
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <WinSock2.h> #include <winsock2.h>
#include <WS2tcpip.h> #include <ws2tcpip.h>
#include <Windows.h> #include <windows.h>
#else #else
#include <unistd.h> #include <unistd.h>
#include <sys/time.h> #include <sys/time.h>

4
osdep/ManagedRoute.cpp
View File

@ -19,8 +19,8 @@
#include <string.h> #include <string.h>
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#include <WinSock2.h> #include <winsock2.h>
#include <Windows.h> #include <windows.h>
#include <netioapi.h> #include <netioapi.h>
#include <IPHlpApi.h> #include <IPHlpApi.h>
#endif #endif

2
osdep/OSUtils.cpp
View File

@ -36,7 +36,7 @@
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#include <windows.h> #include <windows.h>
#include <wincrypt.h> #include <wincrypt.h>
#include <ShlObj.h> #include <shlobj.h>
#include <netioapi.h> #include <netioapi.h>
#include <iphlpapi.h> #include <iphlpapi.h>
#endif #endif

6
osdep/OSUtils.hpp
View File

@ -28,9 +28,9 @@
#include "../node/InetAddress.hpp" #include "../node/InetAddress.hpp"
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#include <WinSock2.h> #include <winsock2.h>
#include <Windows.h> #include <windows.h>
#include <Shlwapi.h> #include <shlwapi.h>
#else #else
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>

6
osdep/Phy.hpp
View File

@ -23,9 +23,9 @@
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <WinSock2.h> #include <winsock2.h>
#include <WS2tcpip.h> #include <ws2tcpip.h>
#include <Windows.h> #include <windows.h>
#define ZT_PHY_SOCKFD_TYPE SOCKET #define ZT_PHY_SOCKFD_TYPE SOCKET
#define ZT_PHY_SOCKFD_NULL (INVALID_SOCKET) #define ZT_PHY_SOCKFD_NULL (INVALID_SOCKET)

5
osdep/PortMapper.cpp
View File

@ -47,14 +47,9 @@
#include <miniupnpc/miniupnpc.h> #include <miniupnpc/miniupnpc.h>
#include <miniupnpc/upnpcommands.h> #include <miniupnpc/upnpcommands.h>
#else #else
#ifdef __ANDROID__
#include "miniupnpc.h"
#include "upnpcommands.h"
#else
#include "../ext/miniupnpc/miniupnpc.h" #include "../ext/miniupnpc/miniupnpc.h"
#include "../ext/miniupnpc/upnpcommands.h" #include "../ext/miniupnpc/upnpcommands.h"
#endif #endif
#endif
#ifdef ZT_USE_SYSTEM_NATPMP #ifdef ZT_USE_SYSTEM_NATPMP
#include <natpmp.h> #include <natpmp.h>

4
osdep/Thread.hpp
View File

@ -20,8 +20,8 @@
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#include <WinSock2.h> #include <winsock2.h>
#include <Windows.h> #include <windows.h>
#include <string.h> #include <string.h>
#include "../node/Mutex.hpp" #include "../node/Mutex.hpp"

6
osdep/WindowsEthernetTap.cpp
View File

@ -15,14 +15,14 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <WinSock2.h> #include <winsock2.h>
#include <Windows.h> #include <windows.h>
#include <tchar.h> #include <tchar.h>
#include <malloc.h> #include <malloc.h>
#include <winreg.h> #include <winreg.h>
#include <wchar.h> #include <wchar.h>
#include <ws2ipdef.h> #include <ws2ipdef.h>
#include <WS2tcpip.h> #include <ws2tcpip.h>
#include <IPHlpApi.h> #include <IPHlpApi.h>
#include <nldef.h> #include <nldef.h>
#include <netioapi.h> #include <netioapi.h>

6
service/OneService.cpp
View File

@ -56,9 +56,9 @@
#include <zeroidc.h> #include <zeroidc.h>
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#include <WinSock2.h> #include <winsock2.h>
#include <Windows.h> #include <windows.h>
#include <ShlObj.h> #include <shlobj.h>
#include <netioapi.h> #include <netioapi.h>
#include <iphlpapi.h> #include <iphlpapi.h>
//#include <unistd.h> //#include <unistd.h>

6
service/SoftwareUpdater.cpp
View File

@ -20,9 +20,9 @@
#include "../version.h" #include "../version.h"
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#include <WinSock2.h> #include <winsock2.h>
#include <Windows.h> #include <windows.h>
#include <ShlObj.h> #include <shlobj.h>
#include <netioapi.h> #include <netioapi.h>
#include <iphlpapi.h> #include <iphlpapi.h>
#else #else

2
windows/ZeroTierOne/ServiceBase.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include <WinSock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
class CServiceBase class CServiceBase

4
windows/ZeroTierOne/ZeroTierOneService.cpp
View File

@ -15,8 +15,8 @@
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <WinSock2.h> #include <winsock2.h>
#include <Windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>