lint fixup for wireguard

Author: xiaokangwang

common/dualStack/happyEyeball/racingDialer.go

@@ -13,9 +13,7 @@ import (
 
 type Dialer func(ctx context.Context, domainDestination net.Destination, ips net.IP) (internet.Connection, error)
 
-func RacingDialer(ctx context.Context,
-	domainDestination net.Destination, ips []net.IP, dialer Dialer,
-	preferIPv6 bool, preferredHeadStart time.Duration) (internet.Connection, error) {
+func RacingDialer(ctx context.Context, domainDestination net.Destination, ips []net.IP, dialer Dialer, preferIPv6 bool, preferredHeadStart time.Duration) (internet.Connection, error) {
 	// check if they are of a single family, if so no one have head start
 	hasIPv4 := false
 	hasIPv6 := false
@@ -32,7 +30,7 @@ func RacingDialer(ctx context.Context,
 	}
 
 	// If there is only one family present, there is no head start
-	if !(hasIPv4 && hasIPv6) {
+	if !hasIPv4 || !hasIPv6 {
 		preferredHeadStart = 0
 	}
 	if preferredHeadStart < 0 {
@@ -93,7 +91,7 @@ func RacingDialer(ctx context.Context,
 				// channel already has a conn, close this extra one
 				_ = c.Close()
 			}
-			finished.Close()
+			_ = finished.Close()
 			return nil
 		})
 	}

common/packetswitch/gvisorstack/adapter.go

@@ -4,17 +4,18 @@ import (
 	"context"
 	"sync"
 
-	"github.com/v2fly/v2ray-core/v5/common"
-	"github.com/v2fly/v2ray-core/v5/common/packetswitch"
 	"gvisor.dev/gvisor/pkg/buffer"
 	"gvisor.dev/gvisor/pkg/tcpip"
 	"gvisor.dev/gvisor/pkg/tcpip/header"
 	"gvisor.dev/gvisor/pkg/tcpip/network/ipv4"
 	"gvisor.dev/gvisor/pkg/tcpip/network/ipv6"
 	"gvisor.dev/gvisor/pkg/tcpip/stack"
+
+	"github.com/v2fly/v2ray-core/v5/common"
+	"github.com/v2fly/v2ray-core/v5/common/packetswitch"
 )
 
-func NewNetworkLayerDeviceToGvisorLinkEndpointAdaptor(ctx context.Context, mtu int, networkLayerSwitch packetswitch.NetworkLayerDevice) *NetworkLayerDeviceToGvisorLinkEndpointAdaptor {
+func NewNetworkLayerDeviceToGvisorLinkEndpointAdaptor(_ context.Context, mtu int, networkLayerSwitch packetswitch.NetworkLayerDevice) *NetworkLayerDeviceToGvisorLinkEndpointAdaptor {
 	return &NetworkLayerDeviceToGvisorLinkEndpointAdaptor{
 		mtu:                mtu,
 		networkLayerSwitch: networkLayerSwitch,
@@ -57,7 +58,7 @@ func (n *NetworkLayerDeviceToGvisorLinkEndpointAdaptor) LinkAddress() tcpip.Link
 	return ""
 }
 
-func (n *NetworkLayerDeviceToGvisorLinkEndpointAdaptor) SetLinkAddress(addr tcpip.LinkAddress) {
+func (n *NetworkLayerDeviceToGvisorLinkEndpointAdaptor) SetLinkAddress(_ tcpip.LinkAddress) {
 	// no-op
 }
 
@@ -154,11 +155,11 @@ func (n *NetworkLayerDeviceToGvisorLinkEndpointAdaptor) ARPHardwareType() header
 	return header.ARPHardwareNone
 }
 
-func (n *NetworkLayerDeviceToGvisorLinkEndpointAdaptor) AddHeader(buffer *stack.PacketBuffer) {
+func (n *NetworkLayerDeviceToGvisorLinkEndpointAdaptor) AddHeader(_ *stack.PacketBuffer) {
 	// No link-layer header to add.
 }
 
-func (n *NetworkLayerDeviceToGvisorLinkEndpointAdaptor) ParseHeader(buffer *stack.PacketBuffer) bool {
+func (n *NetworkLayerDeviceToGvisorLinkEndpointAdaptor) ParseHeader(_ *stack.PacketBuffer) bool {
 	// Nothing to parse; packet is a bare network packet.
 	return true
 }

proxy/wireguard/wgcommon/setup.go

@@ -45,10 +45,10 @@ func (w *WrappedWireguardDevice) SetupDeviceWithoutPeers() error {
 
 	var sb strings.Builder
 	if len(w.config.PrivateKey) > 0 {
-		sb.WriteString(fmt.Sprintf("private_key=%x\n", w.config.PrivateKey))
+		_, _ = fmt.Fprintf(&sb, "private_key=%x\n", w.config.PrivateKey)
 	}
 	if w.config.ListenPort != 0 {
-		sb.WriteString(fmt.Sprintf("listen_port=%d\n", w.config.ListenPort))
+		_, _ = fmt.Fprintf(&sb, "listen_port=%d\n", w.config.ListenPort)
 	}
 
 	// Terminate operation with a blank line.
@@ -75,23 +75,23 @@ func (w *WrappedWireguardDevice) AddOrReplacePeers(peers []*PeerConfig) error {
 			continue
 		}
 		// start peer block
-		sb.WriteString(fmt.Sprintf("public_key=%x\n", p.PublicKey))
+		_, _ = fmt.Fprintf(&sb, "public_key=%x\n", p.PublicKey)
 		if len(p.PresharedKey) > 0 {
-			sb.WriteString(fmt.Sprintf("preshared_key=%x\n", p.PresharedKey))
+			_, _ = fmt.Fprintf(&sb, "preshared_key=%x\n", p.PresharedKey)
 		}
 		if p.Endpoint != "" {
-			sb.WriteString(fmt.Sprintf("endpoint=%s\n", p.Endpoint))
+			_, _ = fmt.Fprintf(&sb, "endpoint=%s\n", p.Endpoint)
 		}
 		if p.PersistentKeepaliveInterval != 0 {
-			sb.WriteString(fmt.Sprintf("persistent_keepalive_interval=%d\n", p.PersistentKeepaliveInterval))
+			_, _ = fmt.Fprintf(&sb, "persistent_keepalive_interval=%d\n", p.PersistentKeepaliveInterval)
 		}
 		// replace allowed IPs for this peer
 		sb.WriteString("replace_allowed_ips=true\n")
 		for _, aip := range p.AllowedIps {
 			if aip == "" {
 				continue
 			}
-			sb.WriteString(fmt.Sprintf("allowed_ip=%s\n", aip))
+			_, _ = fmt.Fprintf(&sb, "allowed_ip=%s\n", aip)
 		}
 	}
 
@@ -113,7 +113,7 @@ func (w *WrappedWireguardDevice) RemovePeer(publicKey []byte) error {
 	}
 
 	var sb strings.Builder
-	sb.WriteString(fmt.Sprintf("public_key=%x\n", publicKey))
+	_, _ = fmt.Fprintf(&sb, "public_key=%x\n", publicKey)
 	sb.WriteString("remove=true\n")
 	sb.WriteString("\n")
 

proxy/wireguard/wgcommon/wgConnAdaptor_test.go

@@ -36,7 +36,7 @@ func TestNetPacketConnToWg_OpenReceive_Send(t *testing.T) {
 	if port == 0 {
 		// LocalAddr should have set actualPort, otherwise use svConn
 		if la := svConn.LocalAddr(); la != nil {
-			if ua, ok := la.(*net.UDPAddr); ok {
+			if ua, ok := la.(*net.UDPAddr); ok && ua.Port != 0 {
 				port = uint16(ua.Port)
 			}
 		}