gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor build fixes for Windows

Browse Source
This commit is contained in:
Joseph Henry
2019-06-11 16:31:59 -07:00
parent 48d8dccff8
commit dcfd4b032a
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -5,9 +5,9 @@ else
DIST_BUILD_SCRIPT := ./dist.sh DIST_BUILD_SCRIPT := ./dist.sh
endif endif
EXECUTABLES = cmake #EXECUTABLES = cmake
build_reqs := $(foreach exec,$(EXECUTABLES),\ #build_reqs := $(foreach exec,$(EXECUTABLES),\
$(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH"))) # $(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH")))
.PHONY: list .PHONY: list
list: list:

4
src/Controls.hpp
View File

@@ -33,6 +33,10 @@
#ifndef LIBZT_CONTROLS_HPP #ifndef LIBZT_CONTROLS_HPP
#define LIBZT_CONTROLS_HPP #define LIBZT_CONTROLS_HPP
#ifdef _WIN32
#include <Windows.h>
#endif
namespace ZeroTier { namespace ZeroTier {
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////

7
src/Sockets.cpp
View File

@@ -38,16 +38,9 @@
#include "ZeroTierConstants.h" #include "ZeroTierConstants.h"
#include "Options.h" #include "Options.h"
#include "Debug.hpp" #include "Debug.hpp"
#include "Controls.hpp"
#ifdef SDK_JNI #ifdef SDK_JNI
#include <jni.h> #include <jni.h>
#ifndef _MSC_VER
//#include <sys/socket.h>
//#include <sys/types.h>
//#include <sys/select.h>
//#include <sys/ioctl.h>
#endif
#endif #endif
namespace ZeroTier { namespace ZeroTier {

6
src/VirtualTap.cpp
View File

@@ -79,7 +79,9 @@ VirtualTap::VirtualTap(
memset(vtap_full_name, 0, sizeof(vtap_full_name)); memset(vtap_full_name, 0, sizeof(vtap_full_name));
snprintf(vtap_full_name, sizeof(vtap_full_name), "libzt%llx", (unsigned long long)_nwid); snprintf(vtap_full_name, sizeof(vtap_full_name), "libzt%llx", (unsigned long long)_nwid);
_dev = vtap_full_name; _dev = vtap_full_name;
#ifndef _WIN32
::pipe(_shutdownSignalPipe); ::pipe(_shutdownSignalPipe);
#endif
// Start virtual tap thread and stack I/O loops // Start virtual tap thread and stack I/O loops
_thread = Thread::start(this); _thread = Thread::start(this);
} }
@@ -90,13 +92,17 @@ VirtualTap::~VirtualTap()
nd->nwid = _nwid; nd->nwid = _nwid;
postEvent(ZTS_EVENT_NETWORK_DOWN, (void*)nd); postEvent(ZTS_EVENT_NETWORK_DOWN, (void*)nd);
_run = false; _run = false;
#ifndef _WIN32
::write(_shutdownSignalPipe[1],"\0",1); ::write(_shutdownSignalPipe[1],"\0",1);
#endif
_phy.whack(); _phy.whack();
lwip_remove_netif(netif); lwip_remove_netif(netif);
netif = NULL; netif = NULL;
Thread::join(_thread); Thread::join(_thread);
#ifndef _WIN32
::close(_shutdownSignalPipe[0]); ::close(_shutdownSignalPipe[0]);
::close(_shutdownSignalPipe[1]); ::close(_shutdownSignalPipe[1]);
#endif
} }
void VirtualTap::lastConfigUpdate(uint64_t lastConfigUpdateTime) void VirtualTap::lastConfigUpdate(uint64_t lastConfigUpdateTime)

2
src/lwipDriver.cpp
View File

@@ -155,7 +155,7 @@ void lwip_driver_init()
#if defined(_WIN32) #if defined(_WIN32)
sys_init(); // Required for win32 init of critical sections sys_init(); // Required for win32 init of critical sections
#endif #endif
void *st = sys_thread_new(ZTS_LWIP_DRIVER_THREAD_NAME, main_lwip_driver_loop, void *st = (void*)sys_thread_new(ZTS_LWIP_DRIVER_THREAD_NAME, main_lwip_driver_loop,
NULL, DEFAULT_THREAD_STACKSIZE, DEFAULT_THREAD_PRIO); NULL, DEFAULT_THREAD_STACKSIZE, DEFAULT_THREAD_PRIO);
} }