From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Mon, 21 Sep 2020 22:17:16 +0000 (-0700)
Subject: device: fix error shadowing before log print
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c4bcedf80ee12e737fb482e7972beb0b84c3361;p=thirdparty%2Fwireguard-go.git

device: fix error shadowing before log print

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
---

diff --git a/device/receive.go b/device/receive.go
index aeaae51..e9cf2bc 100644
--- a/device/receive.go
+++ b/device/receive.go
@@ -633,14 +633,14 @@ func (peer *Peer) RoutineSequentialReceiver() {
 
 		offset := MessageTransportOffsetContent
 		_, err := device.tun.device.Write(elem.buffer[:offset+len(elem.packet)], offset)
+		if err != nil && !device.isClosed.Get() {
+			logError.Println("Failed to write packet to TUN device:", err)
+		}
 		if len(peer.queue.inbound) == 0 {
-			err = device.tun.device.Flush()
+			err := device.tun.device.Flush()
 			if err != nil {
 				peer.device.log.Error.Printf("Unable to flush packets: %v", err)
 			}
 		}
-		if err != nil && !device.isClosed.Get() {
-			logError.Println("Failed to write packet to TUN device:", err)
-		}
 	}
 }