From b00b2c29514549b6ec1f04b788191a9eabf4e723 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Tue, 19 Jan 2021 13:39:48 -0800 Subject: [PATCH] tun: fix fmt.Errorf format strings Type tcpip.Error is not an error. I've filed https://github.com/google/gvisor/issues/5314 to fix this upstream. Until that is fixed, use %v instead of %w, to keep vet happy. Signed-off-by: Josh Bleecher Snyder --- tun/tun_net.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tun/tun_net.go b/tun/tun_net.go index 8543341..9a6f26f 100644 --- a/tun/tun_net.go +++ b/tun/tun_net.go @@ -103,19 +103,19 @@ func CreateNetTUN(localAddresses []net.IP, dnsServers []net.IP, mtu int) (Device } tcpipErr := dev.stack.CreateNIC(1, (*endpoint)(dev)) if tcpipErr != nil { - return nil, nil, fmt.Errorf("CreateNIC: %w", tcpipErr) + return nil, nil, fmt.Errorf("CreateNIC: %v", tcpipErr) } for _, ip := range localAddresses { if ip4 := ip.To4(); ip4 != nil { tcpipErr = dev.stack.AddAddress(1, ipv4.ProtocolNumber, tcpip.Address(ip4)) if tcpipErr != nil { - return nil, nil, fmt.Errorf("AddAddress(%v): %w", ip4, tcpipErr) + return nil, nil, fmt.Errorf("AddAddress(%v): %v", ip4, tcpipErr) } dev.hasV4 = true } else { tcpipErr = dev.stack.AddAddress(1, ipv6.ProtocolNumber, tcpip.Address(ip)) if tcpipErr != nil { - return nil, nil, fmt.Errorf("AddAddress(%v): %w", ip4, tcpipErr) + return nil, nil, fmt.Errorf("AddAddress(%v): %v", ip4, tcpipErr) } dev.hasV6 = true }