From 373a5f18d6cc04ae3fb2be1474e59bfe13272ff7 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 26 Oct 2018 20:27:44 +0200 Subject: [PATCH] tools: update submodules Signed-off-by: Jason A. Donenfeld --- app/tools/libwg-go/src/tun/api-android.go | 10 ++++++---- app/tools/wireguard | 2 +- app/tools/wireguard-go | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/tools/libwg-go/src/tun/api-android.go b/app/tools/libwg-go/src/tun/api-android.go index 90986c4d..4f0dd968 100644 --- a/app/tools/libwg-go/src/tun/api-android.go +++ b/app/tools/libwg-go/src/tun/api-android.go @@ -11,11 +11,13 @@ import ( ) func CreateTUNFromFD(tun_fd int) (TUNDevice, string, error) { + file := os.NewFile(uintptr(tun_fd), "/dev/tun") tun := &nativeTun{ - fd: os.NewFile(uintptr(tun_fd), "/dev/tun"), - events: make(chan TUNEvent, 5), - errors: make(chan error, 5), - nopi: true, + tunFile: file, + fd: file.Fd(), + events: make(chan TUNEvent, 5), + errors: make(chan error, 5), + nopi: true, } var err error tun.fdCancel, err = rwcancel.NewRWCancel(tun_fd) diff --git a/app/tools/wireguard b/app/tools/wireguard index 36c4f104..abc9fae9 160000 --- a/app/tools/wireguard +++ b/app/tools/wireguard @@ -1 +1 @@ -Subproject commit 36c4f1047ed51d7dd4128ff4ceb837a56470646c +Subproject commit abc9fae9e2b93e276e9734fe6e784947165c30e0 diff --git a/app/tools/wireguard-go b/app/tools/wireguard-go index 5d6083df..8be1fc9c 160000 --- a/app/tools/wireguard-go +++ b/app/tools/wireguard-go @@ -1 +1 @@ -Subproject commit 5d6083df7e0399d9cbb47a9dc0b227fd86ccffbb +Subproject commit 8be1fc9c00407b85073ed66d95f12202df674ccb