diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-10-26 20:27:44 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-10-30 01:01:49 +0100 |
| commit | 373a5f18d6cc04ae3fb2be1474e59bfe13272ff7 (patch) | |
| tree | e098de6ee8567aa25354ae6692fc97681cbc31e2 | |
| parent | 36058ead7dcd5a80a32020aa20a7c818b20cf8fc (diff) | |
tools: update submodules
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | app/tools/libwg-go/src/tun/api-android.go | 10 | ||||
| m--------- | app/tools/wireguard | 0 | ||||
| m--------- | app/tools/wireguard-go | 0 |
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 |