tools: update submodules

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-10-26 20:27:44 +02:00
parent 36058ead7d
commit 373a5f18d6
3 changed files with 8 additions and 6 deletions

View File

@ -11,11 +11,13 @@ import (
) )
func CreateTUNFromFD(tun_fd int) (TUNDevice, string, error) { func CreateTUNFromFD(tun_fd int) (TUNDevice, string, error) {
file := os.NewFile(uintptr(tun_fd), "/dev/tun")
tun := &nativeTun{ tun := &nativeTun{
fd: os.NewFile(uintptr(tun_fd), "/dev/tun"), tunFile: file,
events: make(chan TUNEvent, 5), fd: file.Fd(),
errors: make(chan error, 5), events: make(chan TUNEvent, 5),
nopi: true, errors: make(chan error, 5),
nopi: true,
} }
var err error var err error
tun.fdCancel, err = rwcancel.NewRWCancel(tun_fd) tun.fdCancel, err = rwcancel.NewRWCancel(tun_fd)

@ -1 +1 @@
Subproject commit 36c4f1047ed51d7dd4128ff4ceb837a56470646c Subproject commit abc9fae9e2b93e276e9734fe6e784947165c30e0

@ -1 +1 @@
Subproject commit 5d6083df7e0399d9cbb47a9dc0b227fd86ccffbb Subproject commit 8be1fc9c00407b85073ed66d95f12202df674ccb