From: Brady OBrien <brady.obrien128@gmail.com>
Date: Fri, 25 May 2018 20:21:34 +0000 (-0500)
Subject: Basic tun name behaviour implemented; now figuring out why it won't close
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de4c43207baea2615bfd55c3b2e3cd2054d3fb57;p=thirdparty%2Fwireguard-go.git

Basic tun name behaviour implemented; now figuring out why it won't close
---

diff --git a/tun/tun_dragonfly.go b/tun/tun_dragonfly.go
index 5ad7097..6d9608b 100644
--- a/tun/tun_dragonfly.go
+++ b/tun/tun_dragonfly.go
@@ -439,8 +439,8 @@ func (tun *nativeTun) Close() error {
 		err4 = renameTun(tun.name,tun.origName)
 	}
 	
-	err1 := tun.rwcancel.Cancel()
 	err2 := tun.fd.Close()
+	err1 := tun.rwcancel.Cancel()
 	if tun.routeSocket != -1 {
 		unix.Shutdown(tun.routeSocket, unix.SHUT_RDWR)
 		err4 = unix.Close(tun.routeSocket)