Reorg.

2025-04-20 22:16:54 +02:00 · 2020-06-05 13:42:34 -07:00 · 2020-06-05 13:42:34 -07:00 · a0374da4f3
commit a0374da4f3
parent 4e44fa009c
63 changed files with 11 additions and 11 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -113,7 +113,7 @@ set(

 add_custom_target(zerotier ALL
 	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-	COMMAND rm -f ./build/zerotier && go build -trimpath -ldflags -s -o ./build/zerotier cmd/zerotier/zerotier.go
+	COMMAND rm -f ./build/zerotier && go build -trimpath -ldflags -s -w -buildmode=pie -o ./build/zerotier cmd/zerotier/zerotier.go
 )
 add_dependencies(zerotier zt_osdep zt_core zt_controller zt_service_io_core)
 ADDITIONAL_CLEAN_FILES(./build/zerotier)
--- a/2
+++ b/2
@ -18,4 +18,4 @@ clean:
 	rm -rf ${BUILDDIR}

 distclean:
-	rm -rf ${BUILDDIR} cmake-build-*
+	rm -rf ${BUILDDIR}
--- a/installsupport/linux/zerotier-containerized/Dockerfile
+++ b/installsupport/linux/zerotier-containerized/Dockerfile
--- a/installsupport/linux/zerotier-containerized/main.sh
+++ b/installsupport/linux/zerotier-containerized/main.sh
--- a/installsupport/linux/zerotier-one.init.rhel6
+++ b/installsupport/linux/zerotier-one.init.rhel6
--- a/installsupport/mac/ZeroTier
+++ b/installsupport/mac/ZeroTier
--- a/installsupport/mac/com.zerotier.one.plist
+++ b/installsupport/mac/com.zerotier.one.plist
--- a/installsupport/mac/get-proxy-settings.sh
+++ b/installsupport/mac/get-proxy-settings.sh
--- a/installsupport/mac/launch.sh
+++ b/installsupport/mac/launch.sh
--- a/installsupport/mac/postinst.sh
+++ b/installsupport/mac/postinst.sh
--- a/installsupport/mac/preinst.sh
+++ b/installsupport/mac/preinst.sh
--- a/installsupport/mac/uninstall.sh
+++ b/installsupport/mac/uninstall.sh
--- a/installsupport/windows/ZeroTier
+++ b/installsupport/windows/ZeroTier
--- a/installsupport/windows/ZeroTier
+++ b/installsupport/windows/ZeroTier
--- a/installsupport/windows/ZeroTier
+++ b/installsupport/windows/ZeroTier
--- a/installsupport/windows/tap-windows-ndis6/certutil.exe
+++ b/installsupport/windows/tap-windows-ndis6/certutil.exe
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/TapDriver6.vcxproj
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/TapDriver6.vcxproj
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/TapDriver6.vcxproj.filters
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/TapDriver6.vcxproj.filters
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/adapter.c
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/adapter.c
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/adapter.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/adapter.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/config.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/config.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/constants.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/constants.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/device.c
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/device.c
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/device.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/device.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/endian.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/endian.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/error.c
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/error.c
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/error.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/error.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/hexdump.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/hexdump.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/lock.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/lock.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/macinfo.c
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/macinfo.c
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/macinfo.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/macinfo.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/mem.c
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/mem.c
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/mem.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/mem.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/oidrequest.c
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/oidrequest.c
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/proto.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/proto.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/prototypes.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/prototypes.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/resource.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/resource.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/resource.rc
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/resource.rc
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/rxpath.c
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/rxpath.c
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/tap-windows.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/tap-windows.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/tap.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/tap.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/tapdrvr.c
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/tapdrvr.c
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/txpath.c
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/txpath.c
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/types.h
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/types.h
--- a/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/zttap300.inf
+++ b/installsupport/windows/tap-windows-ndis6/src/tap-windows-ndis6/zttap300.inf
--- a/installsupport/windows/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi
+++ b/installsupport/windows/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi
--- a/installsupport/windows/tap-windows-ndis6/x64/zttap300.cat
+++ b/installsupport/windows/tap-windows-ndis6/x64/zttap300.cat
--- a/installsupport/windows/tap-windows-ndis6/x64/zttap300.inf
+++ b/installsupport/windows/tap-windows-ndis6/x64/zttap300.inf
--- a/installsupport/windows/tap-windows-ndis6/x64/zttap300.sys
+++ b/installsupport/windows/tap-windows-ndis6/x64/zttap300.sys
--- a/installsupport/windows/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi
+++ b/installsupport/windows/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi
--- a/installsupport/windows/tap-windows-ndis6/x86/zttap300.cat
+++ b/installsupport/windows/tap-windows-ndis6/x86/zttap300.cat
--- a/installsupport/windows/tap-windows-ndis6/x86/zttap300.inf
+++ b/installsupport/windows/tap-windows-ndis6/x86/zttap300.inf
--- a/installsupport/windows/tap-windows-ndis6/x86/zttap300.sys
+++ b/installsupport/windows/tap-windows-ndis6/x86/zttap300.sys
--- a/installsupport/windows/tap-windows-ndis6/zttap300.cer
+++ b/installsupport/windows/tap-windows-ndis6/zttap300.cer
--- a/pkg/zerotier/endpoint.go
+++ b/pkg/zerotier/endpoint.go
@ -1,6 +1,6 @@
 package zerotier

-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 // static inline const ZT_Fingerprint *_getFP(const ZT_Endpoint *ep) { return &(ep->value.fp); }
 // static inline uint64_t _getAddress(const ZT_Endpoint *ep) { return ep->value.fp.address; }
 // static inline uint64_t _getMAC(const ZT_Endpoint *ep) { return ep->value.mac; }
--- a/pkg/zerotier/fingerprint.go
+++ b/pkg/zerotier/fingerprint.go
@ -13,7 +13,7 @@

 package zerotier

-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"

 import (
--- a/pkg/zerotier/identity.go
+++ b/pkg/zerotier/identity.go
@ -13,7 +13,7 @@

 package zerotier

-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"

 import (
--- a/pkg/zerotier/inetaddress.go
+++ b/pkg/zerotier/inetaddress.go
@ -13,7 +13,7 @@

 package zerotier

-//#include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"

 import (
--- a/pkg/zerotier/locator.go
+++ b/pkg/zerotier/locator.go
@ -13,7 +13,7 @@

 package zerotier

-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"

 import (
--- a/pkg/zerotier/nativetap.go
+++ b/pkg/zerotier/nativetap.go
@ -16,7 +16,7 @@
 package zerotier

 //#cgo CFLAGS: -O3
-//#include "../../native/GoGlue.h"
+//#include "../../serviceiocore/GoGlue.h"
 import "C"

 import (
--- a/pkg/zerotier/node.go
+++ b/pkg/zerotier/node.go
@ -16,7 +16,7 @@ package zerotier
 // #cgo CFLAGS: -O3
 // #cgo darwin LDFLAGS: ${SRCDIR}/../../../build/go/native/libzt_go_native.a ${SRCDIR}/../../../build/node/libzt_core.a ${SRCDIR}/../../../build/osdep/libzt_osdep.a -lc++ -lpthread
 // #cgo linux android LDFLAGS: ${SRCDIR}/../../../build/go/native/libzt_go_native.a ${SRCDIR}/../../../build/node/libzt_core.a ${SRCDIR}/../../../build/osdep/libzt_osdep.a -lstdc++ -lpthread -lm
-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"

 import (
--- a/pkg/zerotier/path.go
+++ b/pkg/zerotier/path.go
@ -13,7 +13,7 @@

 package zerotier

-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"

 // Path is a path to another peer on the network
--- a/pkg/zerotier/peer.go
+++ b/pkg/zerotier/peer.go
@ -13,7 +13,7 @@

 package zerotier

-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"

 import "unsafe"