Reorg.

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)

Makefile

@@ -18,4 +18,4 @@ clean:
 	rm -rf ${BUILDDIR}
 
 distclean:
-	rm -rf ${BUILDDIR} cmake-build-*
+	rm -rf ${BUILDDIR}

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; }

pkg/zerotier/fingerprint.go

@@ -13,7 +13,7 @@
 
 package zerotier
 
-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"
 
 import (

pkg/zerotier/identity.go

@@ -13,7 +13,7 @@
 
 package zerotier
 
-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"
 
 import (

pkg/zerotier/inetaddress.go

@@ -13,7 +13,7 @@
 
 package zerotier
 
-//#include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"
 
 import (

pkg/zerotier/locator.go

@@ -13,7 +13,7 @@
 
 package zerotier
 
-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"
 
 import (

pkg/zerotier/nativetap.go

@@ -16,7 +16,7 @@
 package zerotier
 
 //#cgo CFLAGS: -O3
-//#include "../../native/GoGlue.h"
+//#include "../../serviceiocore/GoGlue.h"
 import "C"
 
 import (

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 (

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

pkg/zerotier/peer.go

@@ -13,7 +13,7 @@
 
 package zerotier
 
-// #include "../../native/GoGlue.h"
+// #include "../../serviceiocore/GoGlue.h"
 import "C"
 
 import "unsafe"