From 6bdeb77cb8922c498662675315d209cc6dbf35d4 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 9 Oct 2018 18:26:21 +0200 Subject: Update to go modules --- app/tools/libwg-go/.gitignore | 2 +- app/tools/libwg-go/Makefile | 38 ++-- app/tools/libwg-go/src/api-android.go | 200 +++++++++++++++++++++ .../src/git.zx2c4.com/wireguard-go/api-android.go | 200 --------------------- .../libwg-go/src/git.zx2c4.com/wireguard-go/jni.c | 59 ------ .../git.zx2c4.com/wireguard-go/queueconstants.go | 16 -- .../git.zx2c4.com/wireguard-go/tun/api-android.go | 31 ---- app/tools/libwg-go/src/jni.c | 59 ++++++ app/tools/libwg-go/src/queueconstants.go | 16 ++ app/tools/libwg-go/src/tun/api-android.go | 31 ++++ 10 files changed, 333 insertions(+), 319 deletions(-) create mode 100644 app/tools/libwg-go/src/api-android.go delete mode 100644 app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/api-android.go delete mode 100644 app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/jni.c delete mode 100644 app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/queueconstants.go delete mode 100644 app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/tun/api-android.go create mode 100644 app/tools/libwg-go/src/jni.c create mode 100644 app/tools/libwg-go/src/queueconstants.go create mode 100644 app/tools/libwg-go/src/tun/api-android.go (limited to 'app/tools/libwg-go') diff --git a/app/tools/libwg-go/.gitignore b/app/tools/libwg-go/.gitignore index c464c736..1454fe8b 100644 --- a/app/tools/libwg-go/.gitignore +++ b/app/tools/libwg-go/.gitignore @@ -1,2 +1,2 @@ -src/ +build/ .gobuildversion diff --git a/app/tools/libwg-go/Makefile b/app/tools/libwg-go/Makefile index 86e6d571..a3c118c2 100644 --- a/app/tools/libwg-go/Makefile +++ b/app/tools/libwg-go/Makefile @@ -2,7 +2,11 @@ # # Copyright © 2017-2018 WireGuard LLC. All Rights Reserved. -FILES := $(filter-out %/main.go %/queueconstants.go,$(wildcard ../wireguard-go/*/*.go) $(wildcard ../wireguard-go/*.go)) +UPSTREAM_FILES := $(filter-out %/main.go %/queueconstants.go,$(wildcard ../wireguard-go/*/*.go) $(wildcard ../wireguard-go/*.go)) ../wireguard-go/go.mod ../wireguard-go/go.sum +DOWNSTREAM_FILES := $(wildcard src/*.go) $(wildcard src/*/*.go) + +BUILDDIR ?= $(CURDIR)/build +DESTDIR ?= $(CURDIR)/out NDK_GO_ARCH_MAP_x86 := 386 NDK_GO_ARCH_MAP_x86_64 := amd64 @@ -28,10 +32,11 @@ GOBUILDTARBALL := https://dl.google.com/go/go$(GOBUILDVERSION).$(GOBUILDOS)-$(GO GOBUILDVERSION_NEEDED := go version go$(GOBUILDVERSION) $(GOBUILDOS)/$(GOBUILDARCH) GOBUILDVERSION_CURRENT := $(shell go version 2>/dev/null) -ifeq ($(GOBUILDVERSION_NEEDED),$(GOBUILDVERSION_CURRENT)) +HAVE_PATCHED_GO := $(shell patch -p1 -f -R -s --dry-run -d "$$(go env GOROOT)" < $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/goruntime-boottime-over-monotonic.diff >/dev/null 2>&1 && echo yes) +ifeq ($(GOBUILDVERSION_NEEDED)|$(HAVE_PATCHED_GO),$(GOBUILDVERSION_CURRENT)|yes) $(info Using system Go) else -export GOROOT := $(CURDIR)/goroot +export GOROOT := $(BUILDDIR)/goroot export PATH := $(GOROOT)/bin:$(PATH) GOBUILDVERSION_CURRENT := $(shell $(GOROOT)/bin/go version 2>/dev/null) ifneq ($(GOBUILDVERSION_NEEDED),$(GOBUILDVERSION_CURRENT)) @@ -42,17 +47,26 @@ $(GOROOT)/bin/go: mkdir -p "$(GOROOT)" curl "$(GOBUILDTARBALL)" | tar -C "$(GOROOT)" --strip-components=1 -xzf - || { rm -rf "$(GOROOT)"; exit 1; } patch -p1 -f -N -r- -d "$(GOROOT)" < goruntime-boottime-over-monotonic.diff || { rm -rf "$(GOROOT)"; exit 1; } -$(DESTDIR)/libwg-go.so: $(GOROOT)/bin/go +$(BUILDDIR)/.prepared: $(GOROOT)/bin/go endif $(shell test "$$(cat .gobuildversion 2>/dev/null)" = "$(GOBUILDVERSION_CURRENT)" || rm -f "$(DESTDIR)/libwg-go.so") -$(DESTDIR)/libwg-go.so: $(FILES) src/git.zx2c4.com/wireguard-go/api-android.go src/git.zx2c4.com/wireguard-go/tun/api-android.go src/git.zx2c4.com/wireguard-go/jni.c - @goroot="$$(go env GOROOT)" || exit 1; patch -p1 -f -R -s --dry-run -d "$$goroot" < goruntime-boottime-over-monotonic.diff >/dev/null 2>&1 || { echo "ERROR: Your system's Go is not patched to use the suspend-aware monotonic clock. Please try again after having run: \`patch -p1 -d \"$$goroot\" < \"$(CURDIR)/goruntime-boottime-over-monotonic.diff\"\`."; exit 1; } - find . -name '*.go' -type l -delete - find . -type d -empty -delete - mkdir -p $(subst ../wireguard-go/,./src/git.zx2c4.com/wireguard-go/,$(dir $(FILES))) - $(foreach FILE,$(FILES),ln -sfrt $(subst ../wireguard-go/,./src/git.zx2c4.com/wireguard-go/,$(dir $(FILE))) $(FILE);) - GOPATH=$(PWD) go get -v -d git.zx2c4.com/wireguard-go - GOPATH=$(PWD) go build -ldflags="-X main.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard" -v -o $(DESTDIR)/libwg-go.so -buildmode c-shared git.zx2c4.com/wireguard-go +define copy-src-to-build +$(subst $(1),$(BUILDDIR)/,$(2)): $(2) + @mkdir -vp "$$(dir $$@)" + @cp -vp "$$<" "$$@" +$(BUILDDIR)/.prepared: $(subst $(1),$(BUILDDIR)/,$(2)) +endef + +$(foreach FILE,$(UPSTREAM_FILES),$(eval $(call copy-src-to-build,../wireguard-go/,$(FILE)))) +$(foreach FILE,$(DOWNSTREAM_FILES),$(eval $(call copy-src-to-build,src/,$(FILE)))) + +$(BUILDDIR)/.prepared: + cd "$(BUILDDIR)" && if ! GOPATH="$(BUILDDIR)/gopath" go get; then chmod -fR +w "$(BUILDDIR)/gopath/pkg/mod"; rm -rf "$(BUILDDIR)/gopath/pkg/mod"; exit 1; fi + chmod -fR +w "$(BUILDDIR)/gopath/pkg/mod" + touch "$@" + +$(DESTDIR)/libwg-go.so: $(BUILDDIR)/.prepared + cd "$(BUILDDIR)" && GOPATH="$(BUILDDIR)/gopath" go build -ldflags="-X main.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard" -v -o "$@" -buildmode c-shared go version > .gobuildversion diff --git a/app/tools/libwg-go/src/api-android.go b/app/tools/libwg-go/src/api-android.go new file mode 100644 index 00000000..e57da84f --- /dev/null +++ b/app/tools/libwg-go/src/api-android.go @@ -0,0 +1,200 @@ +/* SPDX-License-Identifier: Apache-2.0 + * + * Copyright (C) 2017-2018 Jason A. Donenfeld . All Rights Reserved. + */ + +package main + +// #cgo LDFLAGS: -llog +// #include +import "C" + +import ( + "bufio" + "git.zx2c4.com/wireguard-go/tun" + "golang.org/x/sys/unix" + "io/ioutil" + "log" + "math" + "net" + "os" + "os/signal" + "runtime" + "strings" + "unsafe" +) + +type AndroidLogger struct { + level C.int + interfaceName string +} + +func (l AndroidLogger) Write(p []byte) (int, error) { + C.__android_log_write(l.level, C.CString("WireGuard/GoBackend/"+l.interfaceName), C.CString(string(p))) + return len(p), nil +} + +type TunnelHandle struct { + device *Device + uapi net.Listener +} + +var tunnelHandles map[int32]TunnelHandle + +func init() { + roamingDisabled = true + tunnelHandles = make(map[int32]TunnelHandle) + signals := make(chan os.Signal) + signal.Notify(signals, unix.SIGUSR2) + go func() { + buf := make([]byte, os.Getpagesize()) + for { + select { + case <-signals: + n := runtime.Stack(buf, true) + buf[n] = 0 + C.__android_log_write(C.ANDROID_LOG_ERROR, C.CString("WireGuard/GoBackend/Stacktrace"), (*_Ctype_char)(unsafe.Pointer(&buf[0]))) + } + } + }() +} + +//export wgTurnOn +func wgTurnOn(ifnameRef string, tun_fd int32, settings string) int32 { + interfaceName := string([]byte(ifnameRef)) + + logger := &Logger{ + Debug: log.New(&AndroidLogger{level: C.ANDROID_LOG_DEBUG, interfaceName: interfaceName}, "", 0), + Info: log.New(&AndroidLogger{level: C.ANDROID_LOG_INFO, interfaceName: interfaceName}, "", 0), + Error: log.New(&AndroidLogger{level: C.ANDROID_LOG_ERROR, interfaceName: interfaceName}, "", 0), + } + + logger.Debug.Println("Debug log enabled") + + tun, name, err := tun.CreateTUNFromFD(int(tun_fd)) + if err != nil { + unix.Close(int(tun_fd)) + logger.Error.Println(err) + return -1 + } + + logger.Info.Println("Attaching to interface", name) + device := NewDevice(tun, logger) + + logger.Debug.Println("Interface has MTU", device.tun.mtu) + + bufferedSettings := bufio.NewReadWriter(bufio.NewReader(strings.NewReader(settings)), bufio.NewWriter(ioutil.Discard)) + setError := ipcSetOperation(device, bufferedSettings) + if setError != nil { + unix.Close(int(tun_fd)) + logger.Error.Println(setError) + return -1 + } + + var uapi net.Listener; + + uapiFile, err := UAPIOpen(name) + if err != nil { + logger.Error.Println(err) + } else { + uapi, err = UAPIListen(name, uapiFile) + if err != nil { + uapiFile.Close() + logger.Error.Println(err) + } else { + go func() { + for { + conn, err := uapi.Accept() + if err != nil { + return + } + go ipcHandle(device, conn) + } + }() + } + } + + device.Up() + logger.Info.Println("Device started") + + var i int32 + for i = 0; i < math.MaxInt32; i++ { + if _, exists := tunnelHandles[i]; !exists { + break + } + } + if i == math.MaxInt32 { + unix.Close(int(tun_fd)) + return -1 + } + tunnelHandles[i] = TunnelHandle{device: device, uapi: uapi} + return i +} + +//export wgTurnOff +func wgTurnOff(tunnelHandle int32) { + handle, ok := tunnelHandles[tunnelHandle] + if !ok { + return + } + delete(tunnelHandles, tunnelHandle) + if handle.uapi != nil { + handle.uapi.Close() + } + handle.device.Close() +} + +//export wgGetSocketV4 +func wgGetSocketV4(tunnelHandle int32) int32 { + handle, ok := tunnelHandles[tunnelHandle] + if !ok { + return -1 + } + native, ok := handle.device.net.bind.(*NativeBind) + if !ok { + return -1 + } + fd := int32(-1) + conn, err := native.ipv4.SyscallConn() + if err != nil { + return -1 + } + err = conn.Control(func(f uintptr) { + fd = int32(f) + }) + if err != nil { + return -1 + } + return fd +} + +//export wgGetSocketV6 +func wgGetSocketV6(tunnelHandle int32) int32 { + handle, ok := tunnelHandles[tunnelHandle] + if !ok { + return -1 + } + native, ok := handle.device.net.bind.(*NativeBind) + if !ok { + return -1 + } + fd := int32(-1) + conn, err := native.ipv6.SyscallConn() + if err != nil { + return -1 + } + err = conn.Control(func(f uintptr) { + fd = int32(f) + }) + if err != nil { + return -1 + } + return fd +} + +//export wgVersion +func wgVersion() *C.char { + return C.CString(WireGuardGoVersion) +} + +func main() {} diff --git a/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/api-android.go b/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/api-android.go deleted file mode 100644 index e57da84f..00000000 --- a/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/api-android.go +++ /dev/null @@ -1,200 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 - * - * Copyright (C) 2017-2018 Jason A. Donenfeld . All Rights Reserved. - */ - -package main - -// #cgo LDFLAGS: -llog -// #include -import "C" - -import ( - "bufio" - "git.zx2c4.com/wireguard-go/tun" - "golang.org/x/sys/unix" - "io/ioutil" - "log" - "math" - "net" - "os" - "os/signal" - "runtime" - "strings" - "unsafe" -) - -type AndroidLogger struct { - level C.int - interfaceName string -} - -func (l AndroidLogger) Write(p []byte) (int, error) { - C.__android_log_write(l.level, C.CString("WireGuard/GoBackend/"+l.interfaceName), C.CString(string(p))) - return len(p), nil -} - -type TunnelHandle struct { - device *Device - uapi net.Listener -} - -var tunnelHandles map[int32]TunnelHandle - -func init() { - roamingDisabled = true - tunnelHandles = make(map[int32]TunnelHandle) - signals := make(chan os.Signal) - signal.Notify(signals, unix.SIGUSR2) - go func() { - buf := make([]byte, os.Getpagesize()) - for { - select { - case <-signals: - n := runtime.Stack(buf, true) - buf[n] = 0 - C.__android_log_write(C.ANDROID_LOG_ERROR, C.CString("WireGuard/GoBackend/Stacktrace"), (*_Ctype_char)(unsafe.Pointer(&buf[0]))) - } - } - }() -} - -//export wgTurnOn -func wgTurnOn(ifnameRef string, tun_fd int32, settings string) int32 { - interfaceName := string([]byte(ifnameRef)) - - logger := &Logger{ - Debug: log.New(&AndroidLogger{level: C.ANDROID_LOG_DEBUG, interfaceName: interfaceName}, "", 0), - Info: log.New(&AndroidLogger{level: C.ANDROID_LOG_INFO, interfaceName: interfaceName}, "", 0), - Error: log.New(&AndroidLogger{level: C.ANDROID_LOG_ERROR, interfaceName: interfaceName}, "", 0), - } - - logger.Debug.Println("Debug log enabled") - - tun, name, err := tun.CreateTUNFromFD(int(tun_fd)) - if err != nil { - unix.Close(int(tun_fd)) - logger.Error.Println(err) - return -1 - } - - logger.Info.Println("Attaching to interface", name) - device := NewDevice(tun, logger) - - logger.Debug.Println("Interface has MTU", device.tun.mtu) - - bufferedSettings := bufio.NewReadWriter(bufio.NewReader(strings.NewReader(settings)), bufio.NewWriter(ioutil.Discard)) - setError := ipcSetOperation(device, bufferedSettings) - if setError != nil { - unix.Close(int(tun_fd)) - logger.Error.Println(setError) - return -1 - } - - var uapi net.Listener; - - uapiFile, err := UAPIOpen(name) - if err != nil { - logger.Error.Println(err) - } else { - uapi, err = UAPIListen(name, uapiFile) - if err != nil { - uapiFile.Close() - logger.Error.Println(err) - } else { - go func() { - for { - conn, err := uapi.Accept() - if err != nil { - return - } - go ipcHandle(device, conn) - } - }() - } - } - - device.Up() - logger.Info.Println("Device started") - - var i int32 - for i = 0; i < math.MaxInt32; i++ { - if _, exists := tunnelHandles[i]; !exists { - break - } - } - if i == math.MaxInt32 { - unix.Close(int(tun_fd)) - return -1 - } - tunnelHandles[i] = TunnelHandle{device: device, uapi: uapi} - return i -} - -//export wgTurnOff -func wgTurnOff(tunnelHandle int32) { - handle, ok := tunnelHandles[tunnelHandle] - if !ok { - return - } - delete(tunnelHandles, tunnelHandle) - if handle.uapi != nil { - handle.uapi.Close() - } - handle.device.Close() -} - -//export wgGetSocketV4 -func wgGetSocketV4(tunnelHandle int32) int32 { - handle, ok := tunnelHandles[tunnelHandle] - if !ok { - return -1 - } - native, ok := handle.device.net.bind.(*NativeBind) - if !ok { - return -1 - } - fd := int32(-1) - conn, err := native.ipv4.SyscallConn() - if err != nil { - return -1 - } - err = conn.Control(func(f uintptr) { - fd = int32(f) - }) - if err != nil { - return -1 - } - return fd -} - -//export wgGetSocketV6 -func wgGetSocketV6(tunnelHandle int32) int32 { - handle, ok := tunnelHandles[tunnelHandle] - if !ok { - return -1 - } - native, ok := handle.device.net.bind.(*NativeBind) - if !ok { - return -1 - } - fd := int32(-1) - conn, err := native.ipv6.SyscallConn() - if err != nil { - return -1 - } - err = conn.Control(func(f uintptr) { - fd = int32(f) - }) - if err != nil { - return -1 - } - return fd -} - -//export wgVersion -func wgVersion() *C.char { - return C.CString(WireGuardGoVersion) -} - -func main() {} diff --git a/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/jni.c b/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/jni.c deleted file mode 100644 index 3c4dce5a..00000000 --- a/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/jni.c +++ /dev/null @@ -1,59 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 - * - * Copyright © 2017-2018 Jason A. Donenfeld . All Rights Reserved. - */ - -#include -#include -#include - -struct go_string { const char *str; long n; }; -extern int wgTurnOn(struct go_string ifname, int tun_fd, struct go_string settings); -extern void wgTurnOff(int handle); -extern int wgGetSocketV4(int handle); -extern int wgGetSocketV6(int handle); -extern char *wgVersion(); - -JNIEXPORT jint JNICALL Java_com_wireguard_android_backend_GoBackend_wgTurnOn(JNIEnv *env, jclass c, jstring ifname, jint tun_fd, jstring settings) -{ - const char *ifname_str = (*env)->GetStringUTFChars(env, ifname, 0); - size_t ifname_len = (*env)->GetStringUTFLength(env, ifname); - const char *settings_str = (*env)->GetStringUTFChars(env, settings, 0); - size_t settings_len = (*env)->GetStringUTFLength(env, settings); - int ret = wgTurnOn((struct go_string){ - .str = ifname_str, - .n = ifname_len - }, tun_fd, (struct go_string){ - .str = settings_str, - .n = settings_len - }); - (*env)->ReleaseStringUTFChars(env, ifname, ifname_str); - (*env)->ReleaseStringUTFChars(env, settings, settings_str); - return ret; -} - -JNIEXPORT void JNICALL Java_com_wireguard_android_backend_GoBackend_wgTurnOff(JNIEnv *env, jclass c, jint handle) -{ - wgTurnOff(handle); -} - -JNIEXPORT jint JNICALL Java_com_wireguard_android_backend_GoBackend_wgGetSocketV4(JNIEnv *env, jclass c, jint handle) -{ - return wgGetSocketV4(handle); -} - -JNIEXPORT jint JNICALL Java_com_wireguard_android_backend_GoBackend_wgGetSocketV6(JNIEnv *env, jclass c, jint handle) -{ - return wgGetSocketV6(handle); -} - -JNIEXPORT jstring JNICALL Java_com_wireguard_android_backend_GoBackend_wgVersion(JNIEnv *env, jclass c) -{ - jstring ret; - char *version = wgVersion(); - if (!version) - return NULL; - ret = (*env)->NewStringUTF(env, version); - free(version); - return ret; -} diff --git a/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/queueconstants.go b/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/queueconstants.go deleted file mode 100644 index b31dcfa5..00000000 --- a/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/queueconstants.go +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 - * - * Copyright (C) 2017-2018 WireGuard LLC. All Rights Reserved. - */ - -package main - -/* Reduce memory consumption for Android */ - -const ( - QueueOutboundSize = 1024 - QueueInboundSize = 1024 - QueueHandshakeSize = 1024 - MaxSegmentSize = 2200 - PreallocatedBuffersPerPool = 4096 -) diff --git a/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/tun/api-android.go b/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/tun/api-android.go deleted file mode 100644 index 90986c4d..00000000 --- a/app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/tun/api-android.go +++ /dev/null @@ -1,31 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 - * - * Copyright (C) 2017-2018 Jason A. Donenfeld . All Rights Reserved. - */ - -package tun - -import ( - "git.zx2c4.com/wireguard-go/rwcancel" - "os" -) - -func CreateTUNFromFD(tun_fd int) (TUNDevice, string, error) { - tun := &nativeTun{ - fd: os.NewFile(uintptr(tun_fd), "/dev/tun"), - events: make(chan TUNEvent, 5), - errors: make(chan error, 5), - nopi: true, - } - var err error - tun.fdCancel, err = rwcancel.NewRWCancel(tun_fd) - if err != nil { - return nil, "", err - } - name, err := tun.Name() - if err != nil { - tun.fdCancel.Cancel() - return nil, "", err - } - return tun, name, nil -} diff --git a/app/tools/libwg-go/src/jni.c b/app/tools/libwg-go/src/jni.c new file mode 100644 index 00000000..3c4dce5a --- /dev/null +++ b/app/tools/libwg-go/src/jni.c @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: Apache-2.0 + * + * Copyright © 2017-2018 Jason A. Donenfeld . All Rights Reserved. + */ + +#include +#include +#include + +struct go_string { const char *str; long n; }; +extern int wgTurnOn(struct go_string ifname, int tun_fd, struct go_string settings); +extern void wgTurnOff(int handle); +extern int wgGetSocketV4(int handle); +extern int wgGetSocketV6(int handle); +extern char *wgVersion(); + +JNIEXPORT jint JNICALL Java_com_wireguard_android_backend_GoBackend_wgTurnOn(JNIEnv *env, jclass c, jstring ifname, jint tun_fd, jstring settings) +{ + const char *ifname_str = (*env)->GetStringUTFChars(env, ifname, 0); + size_t ifname_len = (*env)->GetStringUTFLength(env, ifname); + const char *settings_str = (*env)->GetStringUTFChars(env, settings, 0); + size_t settings_len = (*env)->GetStringUTFLength(env, settings); + int ret = wgTurnOn((struct go_string){ + .str = ifname_str, + .n = ifname_len + }, tun_fd, (struct go_string){ + .str = settings_str, + .n = settings_len + }); + (*env)->ReleaseStringUTFChars(env, ifname, ifname_str); + (*env)->ReleaseStringUTFChars(env, settings, settings_str); + return ret; +} + +JNIEXPORT void JNICALL Java_com_wireguard_android_backend_GoBackend_wgTurnOff(JNIEnv *env, jclass c, jint handle) +{ + wgTurnOff(handle); +} + +JNIEXPORT jint JNICALL Java_com_wireguard_android_backend_GoBackend_wgGetSocketV4(JNIEnv *env, jclass c, jint handle) +{ + return wgGetSocketV4(handle); +} + +JNIEXPORT jint JNICALL Java_com_wireguard_android_backend_GoBackend_wgGetSocketV6(JNIEnv *env, jclass c, jint handle) +{ + return wgGetSocketV6(handle); +} + +JNIEXPORT jstring JNICALL Java_com_wireguard_android_backend_GoBackend_wgVersion(JNIEnv *env, jclass c) +{ + jstring ret; + char *version = wgVersion(); + if (!version) + return NULL; + ret = (*env)->NewStringUTF(env, version); + free(version); + return ret; +} diff --git a/app/tools/libwg-go/src/queueconstants.go b/app/tools/libwg-go/src/queueconstants.go new file mode 100644 index 00000000..b31dcfa5 --- /dev/null +++ b/app/tools/libwg-go/src/queueconstants.go @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * Copyright (C) 2017-2018 WireGuard LLC. All Rights Reserved. + */ + +package main + +/* Reduce memory consumption for Android */ + +const ( + QueueOutboundSize = 1024 + QueueInboundSize = 1024 + QueueHandshakeSize = 1024 + MaxSegmentSize = 2200 + PreallocatedBuffersPerPool = 4096 +) diff --git a/app/tools/libwg-go/src/tun/api-android.go b/app/tools/libwg-go/src/tun/api-android.go new file mode 100644 index 00000000..90986c4d --- /dev/null +++ b/app/tools/libwg-go/src/tun/api-android.go @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: Apache-2.0 + * + * Copyright (C) 2017-2018 Jason A. Donenfeld . All Rights Reserved. + */ + +package tun + +import ( + "git.zx2c4.com/wireguard-go/rwcancel" + "os" +) + +func CreateTUNFromFD(tun_fd int) (TUNDevice, string, error) { + tun := &nativeTun{ + fd: os.NewFile(uintptr(tun_fd), "/dev/tun"), + events: make(chan TUNEvent, 5), + errors: make(chan error, 5), + nopi: true, + } + var err error + tun.fdCancel, err = rwcancel.NewRWCancel(tun_fd) + if err != nil { + return nil, "", err + } + name, err := tun.Name() + if err != nil { + tun.fdCancel.Cancel() + return nil, "", err + } + return tun, name, nil +} -- cgit v1.2.3