tunnel: bump all tools

zx2c4 · zx2c4 · commit 4c3289aa5241 · 2021-02-11T16:00:28.000+01:00
Signed-off-by: Jason A. Donenfeld &lt;Jason@zx2c4.com&gt;
diff --git a/tunnel/tools/libwg-go/api-android.go b/tunnel/tools/libwg-go/api-android.go
@@ -119,7 +119,13 @@ func wgTurnOn(interfaceName string, tunFd int32, settings string) int32 {
 		}
 	}
 
-	device.Up()
+	err = device.Up()
+	if err != nil {
+		logger.Errorf("Unable to bring up device: %v", err)
+		uapiFile.Close()
+		device.Close()
+		return -1
+	}
 	logger.Verbosef("Device started")
 
 	var i int32
@@ -129,7 +135,9 @@ func wgTurnOn(interfaceName string, tunFd int32, settings string) int32 {
 		}
 	}
 	if i == math.MaxInt32 {
-		unix.Close(int(tunFd))
+		logger.Errorf("Unable to find empty handle")
+		uapiFile.Close()
+		device.Close()
 		return -1
 	}
 	tunnelHandles[i] = TunnelHandle{device: device, uapi: uapi}
diff --git a/tunnel/tools/libwg-go/go.mod b/tunnel/tools/libwg-go/go.mod
@@ -5,5 +5,5 @@ go 1.15
 require (
 	golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
 	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c
-	golang.zx2c4.com/wireguard v0.0.20201119-0.20210126220548-d669c78c4306
+	golang.zx2c4.com/wireguard v0.0.0-20210211144856-ef8115f63b22
 )
diff --git a/tunnel/tools/libwg-go/go.sum b/tunnel/tools/libwg-go/go.sum
@@ -18,5 +18,5 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.zx2c4.com/wireguard v0.0.20201119-0.20210126220548-d669c78c4306 h1:z7W9tlhU/KwkZWSX6QCfZXBcDpIa1JYANldQ/gFJj44=
-golang.zx2c4.com/wireguard v0.0.20201119-0.20210126220548-d669c78c4306/go.mod h1:r0ExowOoGFfDoLDxx+M9SYbNVsoZ0xviLL+K4f2mt+A=
+golang.zx2c4.com/wireguard v0.0.0-20210211144856-ef8115f63b22 h1:7Ct1Jps4o4u2hBFWrg8Rt65VmXfMPTeR0OSXxdq8gMk=
+golang.zx2c4.com/wireguard v0.0.0-20210211144856-ef8115f63b22/go.mod h1:r0ExowOoGFfDoLDxx+M9SYbNVsoZ0xviLL+K4f2mt+A=
diff --git a/tunnel/tools/wireguard-tools b/tunnel/tools/wireguard-tools
@@ -1 +1 @@
-Subproject commit 265e81a344defb05bd7d420d125cde169b8995af
+Subproject commit e8fa0f662f2541952e745d9c7fff0eeaec538a5c

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,13 @@ func wgTurnOn(interfaceName string, tunFd int32, settings string) int32 {`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`122`		`- device.Up()`
	`122`	`+ err = device.Up()`
	`123`	`+ if err != nil {`
	`124`	`+ logger.Errorf("Unable to bring up device: %v", err)`
	`125`	`+ uapiFile.Close()`
	`126`	`+ device.Close()`
	`127`	`+ return -1`
	`128`	`+ }`
`123`	`129`	`logger.Verbosef("Device started")`
`124`	`130`
`125`	`131`	`var i int32`
`@@ -129,7 +135,9 @@ func wgTurnOn(interfaceName string, tunFd int32, settings string) int32 {`
`129`	`135`	`}`
`130`	`136`	`}`
`131`	`137`	`if i == math.MaxInt32 {`
`132`		`- unix.Close(int(tunFd))`
	`138`	`+ logger.Errorf("Unable to find empty handle")`
	`139`	`+ uapiFile.Close()`
	`140`	`+ device.Close()`
`133`	`141`	`return -1`
`134`	`142`	`}`
`135`	`143`	`tunnelHandles[i] = TunnelHandle{device: device, uapi: uapi}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ go 1.15`
`5`	`5`	`require (`
`6`	`6`	`golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect`
`7`	`7`	`golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c`
`8`		`- golang.zx2c4.com/wireguard v0.0.20201119-0.20210126220548-d669c78c4306`
	`8`	`+ golang.zx2c4.com/wireguard v0.0.0-20210211144856-ef8115f63b22`
`9`	`9`	`)`