summaryrefslogtreecommitdiffhomepage
path: root/app/tools
diff options
context:
space:
mode:
Diffstat (limited to 'app/tools')
-rw-r--r--app/tools/libwg-go/src/tun/api-android.go10
m---------app/tools/wireguard0
m---------app/tools/wireguard-go0
3 files changed, 6 insertions, 4 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
-Subproject 36c4f1047ed51d7dd4128ff4ceb837a56470646
+Subproject abc9fae9e2b93e276e9734fe6e784947165c30e
diff --git a/app/tools/wireguard-go b/app/tools/wireguard-go
-Subproject 5d6083df7e0399d9cbb47a9dc0b227fd86ccffb
+Subproject 8be1fc9c00407b85073ed66d95f12202df674cc