]> git.ipfire.org Git - thirdparty/wireguard-go.git/commitdiff
device: fix error shadowing before log print
authorBrad Fitzpatrick <bradfitz@tailscale.com>
Mon, 21 Sep 2020 22:17:16 +0000 (15:17 -0700)
committerJason A. Donenfeld <Jason@zx2c4.com>
Thu, 17 Dec 2020 11:15:14 +0000 (12:15 +0100)
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
device/receive.go

index aeaae51d2f5c12364321ce9207c750aa310494d4..e9cf2bc594b4ceb45849f29fd27008b17a81481e 100644 (file)
@@ -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)
-               }
        }
 }