Chore: apply gofumpt rules (#498)

xjasonlyu · web-flow · commit ef4516522f9a · 2025-10-08T08:12:34.000-04:00
diff --git a/dialer/sockopt_darwin.go b/dialer/sockopt_darwin.go
@@ -9,7 +9,7 @@ import (
 
 func setSocketOptions(network, address string, c syscall.RawConn, opts *Options) (err error) {
 	if opts == nil || !isTCPSocket(network) && !isUDPSocket(network) {
-		return
+		return err
 	}
 
 	var innerErr error
@@ -41,5 +41,5 @@ func setSocketOptions(network, address string, c syscall.RawConn, opts *Options)
 	if innerErr != nil {
 		err = innerErr
 	}
-	return
+	return err
 }
diff --git a/dialer/sockopt_freebsd.go b/dialer/sockopt_freebsd.go
@@ -9,7 +9,7 @@ import (
 
 func setSocketOptions(network, address string, c syscall.RawConn, opts *Options) (err error) {
 	if opts == nil || !isTCPSocket(network) && !isUDPSocket(network) {
-		return
+		return err
 	}
 
 	var innerErr error
@@ -29,5 +29,5 @@ func setSocketOptions(network, address string, c syscall.RawConn, opts *Options)
 	if innerErr != nil {
 		err = innerErr
 	}
-	return
+	return err
 }
diff --git a/dialer/sockopt_linux.go b/dialer/sockopt_linux.go
@@ -9,7 +9,7 @@ import (
 
 func setSocketOptions(network, address string, c syscall.RawConn, opts *Options) (err error) {
 	if opts == nil || !isTCPSocket(network) && !isUDPSocket(network) {
-		return
+		return err
 	}
 
 	var innerErr error
@@ -40,5 +40,5 @@ func setSocketOptions(network, address string, c syscall.RawConn, opts *Options)
 	if innerErr != nil {
 		err = innerErr
 	}
-	return
+	return err
 }
diff --git a/dialer/sockopt_openbsd.go b/dialer/sockopt_openbsd.go
@@ -9,7 +9,7 @@ import (
 
 func setSocketOptions(network, address string, c syscall.RawConn, opts *Options) (err error) {
 	if opts == nil || !isTCPSocket(network) && !isUDPSocket(network) {
-		return
+		return err
 	}
 
 	var innerErr error
@@ -29,5 +29,5 @@ func setSocketOptions(network, address string, c syscall.RawConn, opts *Options)
 	if innerErr != nil {
 		err = innerErr
 	}
-	return
+	return err
 }
diff --git a/dialer/sockopt_windows.go b/dialer/sockopt_windows.go
@@ -16,7 +16,7 @@ const (
 
 func setSocketOptions(network, address string, c syscall.RawConn, opts *Options) (err error) {
 	if opts == nil || !isTCPSocket(network) && !isUDPSocket(network) {
-		return
+		return err
 	}
 
 	var innerErr error
@@ -51,7 +51,7 @@ func setSocketOptions(network, address string, c syscall.RawConn, opts *Options)
 	if innerErr != nil {
 		err = innerErr
 	}
-	return
+	return err
 }
 
 func bindSocketToInterface4(handle windows.Handle, index uint32) error {
diff --git a/engine/engine.go b/engine/engine.go
@@ -191,12 +191,12 @@ func netstack(k *Key) (err error) {
 	}()
 
 	if _defaultProxy, err = parseProxy(k.Proxy); err != nil {
-		return
+		return err
 	}
 	tunnel.T().SetDialer(_defaultProxy)
 
 	if _defaultDevice, err = parseDevice(k.Device, uint32(k.MTU)); err != nil {
-		return
+		return err
 	}
 
 	var multicastGroups []netip.Addr
@@ -231,7 +231,7 @@ func netstack(k *Key) (err error) {
 		MulticastGroups:  multicastGroups,
 		Options:          opts,
 	}); err != nil {
-		return
+		return err
 	}
 
 	log.Infof(
diff --git a/proxy/http.go b/proxy/http.go
@@ -46,7 +46,7 @@ func (h *HTTP) DialContext(ctx context.Context, metadata *M.Metadata) (c net.Con
 	}(c)
 
 	err = h.shakeHand(metadata, c)
-	return
+	return c, err
 }
 
 func (h *HTTP) shakeHand(metadata *M.Metadata, rw io.ReadWriter) error {
diff --git a/proxy/relay.go b/proxy/relay.go
@@ -89,10 +89,10 @@ func (rl *Relay) dialContext(ctx context.Context, metadata *M.Metadata) (rc *rel
 
 	if rl.noDelay {
 		if _, err = req.WriteTo(c); err != nil {
-			return
+			return rc, err
 		}
 		if err = readRelayResponse(c); err != nil {
-			return
+			return rc, err
 		}
 	}
 
@@ -101,22 +101,22 @@ func (rl *Relay) dialContext(ctx context.Context, metadata *M.Metadata) (rc *rel
 		rc = newRelayConn(c, metadata.Addr(), rl.noDelay, false)
 		if !rl.noDelay {
 			if _, err = req.WriteTo(rc.wbuf); err != nil {
-				return
+				return rc, err
 			}
 		}
 	case M.UDP:
 		rc = newRelayConn(c, metadata.Addr(), rl.noDelay, true)
 		if !rl.noDelay {
 			if _, err = req.WriteTo(rc.wbuf); err != nil {
-				return
+				return rc, err
 			}
 		}
 	default:
 		err = fmt.Errorf("network %s is unsupported", metadata.Network)
-		return
+		return rc, err
 	}
 
-	return
+	return rc, err
 }
 
 type relayConn struct {
@@ -151,7 +151,7 @@ func (rc *relayConn) Read(b []byte) (n int, err error) {
 		}
 	})
 	if err != nil {
-		return
+		return n, err
 	}
 
 	if !rc.udp {
@@ -161,7 +161,7 @@ func (rc *relayConn) Read(b []byte) (n int, err error) {
 	var bb [2]byte
 	_, err = io.ReadFull(rc.Conn, bb[:])
 	if err != nil {
-		return
+		return n, err
 	}
 
 	dLen := int(binary.BigEndian.Uint16(bb[:]))
@@ -174,7 +174,7 @@ func (rc *relayConn) Read(b []byte) (n int, err error) {
 	_, err = io.ReadFull(rc.Conn, buf)
 	n = copy(b, buf)
 
-	return
+	return n, err
 }
 
 func (rc *relayConn) WriteTo(b []byte, _ net.Addr) (int, error) {
@@ -194,15 +194,15 @@ func (rc *relayConn) tcpWrite(b []byte) (n int, err error) {
 		rc.wbuf.Write(b)
 		_, err = rc.Conn.Write(rc.wbuf.Bytes())
 		rc.wbuf.Reset()
-		return
+		return n, err
 	}
 	return rc.Conn.Write(b)
 }
 
 func (rc *relayConn) udpWrite(b []byte) (n int, err error) {
 	if len(b) > math.MaxUint16 {
 		err = errors.New("write: data maximum exceeded")
-		return
+		return n, err
 	}
 
 	n = len(b)
@@ -212,14 +212,14 @@ func (rc *relayConn) udpWrite(b []byte) (n int, err error) {
 		rc.wbuf.Write(bb[:])
 		rc.wbuf.Write(b)
 		_, err = rc.wbuf.WriteTo(rc.Conn)
-		return
+		return n, err
 	}
 
 	var bb [2]byte
 	binary.BigEndian.PutUint16(bb[:], uint16(len(b)))
 	_, err = rc.Conn.Write(bb[:])
 	if err != nil {
-		return
+		return n, err
 	}
 	return rc.Conn.Write(b)
 }
diff --git a/proxy/shadowsocks.go b/proxy/shadowsocks.go
@@ -63,7 +63,7 @@ func (ss *Shadowsocks) DialContext(ctx context.Context, metadata *M.Metadata) (c
 
 	c = ss.cipher.StreamConn(c)
 	_, err = c.Write(serializeSocksAddr(metadata))
-	return
+	return c, err
 }
 
 func (ss *Shadowsocks) DialUDP(*M.Metadata) (net.PacketConn, error) {
@@ -96,7 +96,7 @@ func (pc *ssPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
 	}
 
 	if err != nil {
-		return
+		return n, err
 	}
 	return pc.PacketConn.WriteTo(packet[3:], pc.rAddr)
 }
diff --git a/proxy/socks4.go b/proxy/socks4.go
@@ -41,5 +41,5 @@ func (ss *Socks4) DialContext(ctx context.Context, metadata *M.Metadata) (c net.
 	}(c)
 
 	err = socks4.ClientHandshake(c, metadata.DestinationAddress(), socks4.CmdConnect, ss.userID)
-	return
+	return c, err
 }
diff --git a/proxy/socks5.go b/proxy/socks5.go
@@ -69,7 +69,7 @@ func (ss *Socks5) DialContext(ctx context.Context, metadata *M.Metadata) (c net.
 	}
 
 	_, err = socks5.ClientHandshake(c, serializeSocksAddr(metadata), socks5.CmdConnect, user)
-	return
+	return c, err
 }
 
 func (ss *Socks5) DialUDP(*M.Metadata) (_ net.PacketConn, err error) {
@@ -161,7 +161,7 @@ func (pc *socksPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
 	}
 
 	if err != nil {
-		return
+		return n, err
 	}
 	return pc.PacketConn.WriteTo(packet, pc.rAddr)
 }
diff --git a/transport/shadowsocks/shadowaead/stream.go b/transport/shadowsocks/shadowaead/stream.go
@@ -42,7 +42,7 @@ func (w *Writer) Write(p []byte) (n int, err error) {
 		w.Seal(buf[:0], nonce, buf[:2], nil)
 		increment(nonce)
 		_, err = w.Writer.Write(buf)
-		return
+		return n, err
 	}
 
 	for nr := 0; n < len(p) && err == nil; n += nr {
@@ -58,7 +58,7 @@ func (w *Writer) Write(p []byte) (n int, err error) {
 		increment(nonce)
 		_, err = w.Writer.Write(buf)
 	}
-	return
+	return n, err
 }
 
 // ReadFrom reads from the given io.Reader until EOF or error, encrypts and
@@ -80,13 +80,13 @@ func (w *Writer) ReadFrom(r io.Reader) (n int64, err error) {
 		increment(nonce)
 		if _, ew := w.Writer.Write(buf[:off+nr+tag]); ew != nil {
 			err = ew
-			return
+			return n, err
 		}
 		if er != nil {
 			if er != io.EOF { // ignore EOF as per io.ReaderFrom contract
 				err = er
 			}
-			return
+			return n, err
 		}
 	}
 }
@@ -180,7 +180,7 @@ func (r *Reader) WriteTo(w io.Writer) (n int64, err error) {
 					r.buf = nil
 				}
 				err = ew
-				return
+				return n, err
 			}
 		}
 
@@ -189,7 +189,7 @@ func (r *Reader) WriteTo(w io.Writer) (n int64, err error) {
 			if er != io.EOF {
 				err = er
 			}
-			return
+			return n, err
 		}
 		r.buf = r.buf[:nr]
 		r.off = 0
diff --git a/transport/shadowsocks/shadowstream/stream.go b/transport/shadowsocks/shadowstream/stream.go
@@ -28,7 +28,7 @@ func (w *Writer) Write(p []byte) (n int, err error) {
 		w.XORKeyStream(buf, p[n:end])
 		nw, err = w.Writer.Write(buf[:end-n])
 	}
-	return
+	return n, err
 }
 
 func (w *Writer) ReadFrom(r io.Reader) (n int64, err error) {
@@ -39,13 +39,13 @@ func (w *Writer) ReadFrom(r io.Reader) (n int64, err error) {
 		b := buf[:nr]
 		w.XORKeyStream(b, b)
 		if _, err = w.Writer.Write(b); err != nil {
-			return
+			return n, err
 		}
 		if er != nil {
 			if er != io.EOF { // ignore EOF as per io.ReaderFrom contract
 				err = er
 			}
-			return
+			return n, err
 		}
 	}
 }
@@ -65,7 +65,7 @@ func (r *Reader) Read(p []byte) (n int, err error) {
 		return 0, err
 	}
 	r.XORKeyStream(p, p[:n])
-	return
+	return n, err
 }
 
 func (r *Reader) WriteTo(w io.Writer) (n int64, err error) {
@@ -78,14 +78,14 @@ func (r *Reader) WriteTo(w io.Writer) (n int64, err error) {
 			n += int64(nw)
 			if ew != nil {
 				err = ew
-				return
+				return n, err
 			}
 		}
 		if er != nil {
 			if er != io.EOF { // ignore EOF as per io.Copy contract (using src.WriteTo shortcut)
 				err = er
 			}
-			return
+			return n, err
 		}
 	}
 }
diff --git a/transport/socks5/socks5.go b/transport/socks5/socks5.go

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`func setSocketOptions(network, address string, c syscall.RawConn, opts *Options) (err error) {`
`11`	`11`	`if opts == nil \|\| !isTCPSocket(network) && !isUDPSocket(network) {`
`12`		`- return`
	`12`	`+ return err`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`var innerErr error`
`@@ -41,5 +41,5 @@ func setSocketOptions(network, address string, c syscall.RawConn, opts *Options)`
`41`	`41`	`if innerErr != nil {`
`42`	`42`	`err = innerErr`
`43`	`43`	`}`
`44`		`- return`
	`44`	`+ return err`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ const (`
`16`	`16`
`17`	`17`	`func setSocketOptions(network, address string, c syscall.RawConn, opts *Options) (err error) {`
`18`	`18`	`if opts == nil \|\| !isTCPSocket(network) && !isUDPSocket(network) {`
`19`		`- return`
	`19`	`+ return err`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`var innerErr error`
`@@ -51,7 +51,7 @@ func setSocketOptions(network, address string, c syscall.RawConn, opts *Options)`
`51`	`51`	`if innerErr != nil {`
`52`	`52`	`err = innerErr`
`53`	`53`	`}`
`54`		`- return`
	`54`	`+ return err`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`func bindSocketToInterface4(handle windows.Handle, index uint32) error {`
Original file line number	Diff line number	Diff line change
`@@ -191,12 +191,12 @@ func netstack(k *Key) (err error) {`
`191`	`191`	`}()`
`192`	`192`
`193`	`193`	`if _defaultProxy, err = parseProxy(k.Proxy); err != nil {`
`194`		`- return`
	`194`	`+ return err`
`195`	`195`	`}`
`196`	`196`	`tunnel.T().SetDialer(_defaultProxy)`
`197`	`197`
`198`	`198`	`if _defaultDevice, err = parseDevice(k.Device, uint32(k.MTU)); err != nil {`
`199`		`- return`
	`199`	`+ return err`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`var multicastGroups []netip.Addr`
`@@ -231,7 +231,7 @@ func netstack(k *Key) (err error) {`
`231`	`231`	`MulticastGroups: multicastGroups,`
`232`	`232`	`Options: opts,`
`233`	`233`	`}); err != nil {`
`234`		`- return`
	`234`	`+ return err`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`log.Infof(`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func (h HTTP) DialContext(ctx context.Context, metadata M.Metadata) (c net.Con`
`46`	`46`	`}(c)`
`47`	`47`
`48`	`48`	`err = h.shakeHand(metadata, c)`
`49`		`- return`
	`49`	`+ return c, err`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`func (h HTTP) shakeHand(metadata M.Metadata, rw io.ReadWriter) error {`
Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,10 @@ func (rl Relay) dialContext(ctx context.Context, metadata M.Metadata) (rc *rel`
`89`	`89`
`90`	`90`	`if rl.noDelay {`
`91`	`91`	`if _, err = req.WriteTo(c); err != nil {`
`92`		`- return`
	`92`	`+ return rc, err`
`93`	`93`	`}`
`94`	`94`	`if err = readRelayResponse(c); err != nil {`
`95`		`- return`
	`95`	`+ return rc, err`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
`@@ -101,22 +101,22 @@ func (rl Relay) dialContext(ctx context.Context, metadata M.Metadata) (rc *rel`
`101`	`101`	`rc = newRelayConn(c, metadata.Addr(), rl.noDelay, false)`
`102`	`102`	`if !rl.noDelay {`
`103`	`103`	`if _, err = req.WriteTo(rc.wbuf); err != nil {`
`104`		`- return`
	`104`	`+ return rc, err`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`	`case M.UDP:`
`108`	`108`	`rc = newRelayConn(c, metadata.Addr(), rl.noDelay, true)`
`109`	`109`	`if !rl.noDelay {`
`110`	`110`	`if _, err = req.WriteTo(rc.wbuf); err != nil {`
`111`		`- return`
	`111`	`+ return rc, err`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`default:`
`115`	`115`	`err = fmt.Errorf("network %s is unsupported", metadata.Network)`
`116`		`- return`
	`116`	`+ return rc, err`
`117`	`117`	`}`
`118`	`118`
`119`		`- return`
	`119`	`+ return rc, err`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`type relayConn struct {`
`@@ -151,7 +151,7 @@ func (rc *relayConn) Read(b []byte) (n int, err error) {`
`151`	`151`	`}`
`152`	`152`	`})`
`153`	`153`	`if err != nil {`
`154`		`- return`
	`154`	`+ return n, err`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`if !rc.udp {`
`@@ -161,7 +161,7 @@ func (rc *relayConn) Read(b []byte) (n int, err error) {`
`161`	`161`	`var bb [2]byte`
`162`	`162`	`_, err = io.ReadFull(rc.Conn, bb[:])`
`163`	`163`	`if err != nil {`
`164`		`- return`
	`164`	`+ return n, err`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`dLen := int(binary.BigEndian.Uint16(bb[:]))`
`@@ -174,7 +174,7 @@ func (rc *relayConn) Read(b []byte) (n int, err error) {`
`174`	`174`	`_, err = io.ReadFull(rc.Conn, buf)`
`175`	`175`	`n = copy(b, buf)`
`176`	`176`
`177`		`- return`
	`177`	`+ return n, err`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`func (rc *relayConn) WriteTo(b []byte, _ net.Addr) (int, error) {`
`@@ -194,15 +194,15 @@ func (rc *relayConn) tcpWrite(b []byte) (n int, err error) {`
`194`	`194`	`rc.wbuf.Write(b)`
`195`	`195`	`_, err = rc.Conn.Write(rc.wbuf.Bytes())`
`196`	`196`	`rc.wbuf.Reset()`
`197`		`- return`
	`197`	`+ return n, err`
`198`	`198`	`}`
`199`	`199`	`return rc.Conn.Write(b)`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`func (rc *relayConn) udpWrite(b []byte) (n int, err error) {`
`203`	`203`	`if len(b) > math.MaxUint16 {`
`204`	`204`	`err = errors.New("write: data maximum exceeded")`
`205`		`- return`
	`205`	`+ return n, err`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`n = len(b)`
`@@ -212,14 +212,14 @@ func (rc *relayConn) udpWrite(b []byte) (n int, err error) {`
`212`	`212`	`rc.wbuf.Write(bb[:])`
`213`	`213`	`rc.wbuf.Write(b)`
`214`	`214`	`_, err = rc.wbuf.WriteTo(rc.Conn)`
`215`		`- return`
	`215`	`+ return n, err`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`var bb [2]byte`
`219`	`219`	`binary.BigEndian.PutUint16(bb[:], uint16(len(b)))`
`220`	`220`	`_, err = rc.Conn.Write(bb[:])`
`221`	`221`	`if err != nil {`
`222`		`- return`
	`222`	`+ return n, err`
`223`	`223`	`}`
`224`	`224`	`return rc.Conn.Write(b)`
`225`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func (ss Shadowsocks) DialContext(ctx context.Context, metadata M.Metadata) (c`
`63`	`63`
`64`	`64`	`c = ss.cipher.StreamConn(c)`
`65`	`65`	`_, err = c.Write(serializeSocksAddr(metadata))`
`66`		`- return`
	`66`	`+ return c, err`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`func (ss Shadowsocks) DialUDP(M.Metadata) (net.PacketConn, error) {`
`@@ -96,7 +96,7 @@ func (pc *ssPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`if err != nil {`
`99`		`- return`
	`99`	`+ return n, err`
`100`	`100`	`}`
`101`	`101`	`return pc.PacketConn.WriteTo(packet[3:], pc.rAddr)`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@ func (ss Socks4) DialContext(ctx context.Context, metadata M.Metadata) (c net.`
`41`	`41`	`}(c)`
`42`	`42`
`43`	`43`	`err = socks4.ClientHandshake(c, metadata.DestinationAddress(), socks4.CmdConnect, ss.userID)`
`44`		`- return`
	`44`	`+ return c, err`
`45`	`45`	`}`