Revert "Chore: Three small 'fixes'"

This reverts commit 4e826abebf.
Bump google.golang.org/protobuf from 1.36.7 to 1.36.8 (#5042 )
2025-12-18 21:24:37 +03:00 · 2025-08-24 08:11:19 +00:00 · 2025-08-21 10:36:38 +00:00
7 changed files with 6 additions and 19 deletions
--- a/app/proxyman/inbound/worker.go
+++ b/app/proxyman/inbound/worker.go
@@ -162,7 +162,6 @@ type udpConn struct {
 	uplink           stats.Counter
 	downlink         stats.Counter
 	inactive         bool
-	cancel           context.CancelFunc
 }

 func (c *udpConn) setInactive() {
@@ -205,9 +204,6 @@ func (c *udpConn) Write(buf []byte) (int, error) {
 }

 func (c *udpConn) Close() error {
-	if c.cancel != nil {
-		c.cancel()
-	}
 	common.Must(c.done.Close())
 	common.Must(common.Close(c.writer))
 	return nil
@@ -264,7 +260,6 @@ func (w *udpWorker) getConnection(id connID) (*udpConn, bool) {
 	defer w.Unlock()

 	if conn, found := w.activeConn[id]; found && !conn.done.Done() {
-		conn.updateActivity()
 		return conn, true
 	}

@@ -312,8 +307,7 @@ func (w *udpWorker) callback(b *buf.Buffer, source net.Destination, originalDest
 		common.Must(w.checker.Start())

 		go func() {
-			ctx, cancel := context.WithCancel(w.ctx)
-			conn.cancel = cancel
+			ctx := w.ctx
 			sid := session.NewID()
 			ctx = c.ContextWithID(ctx, sid)

--- a/go.mod
+++ b/go.mod
@@ -27,7 +27,7 @@ require (
 	golang.org/x/sys v0.35.0
 	golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173
 	google.golang.org/grpc v1.75.0
-	google.golang.org/protobuf v1.36.7
+	google.golang.org/protobuf v1.36.8
 	gvisor.dev/gvisor v0.0.0-20250428193742-2d800c3129d5
 	h12.io/socks v1.0.3
 	lukechampine.com/blake3 v1.4.1
--- a/go.sum
+++ b/go.sum
@@ -145,8 +145,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4=
 google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
-google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
-google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
+google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
--- a/proxy/shadowsocks/server.go
+++ b/proxy/shadowsocks/server.go
@@ -128,7 +128,6 @@ func (s *Server) handleUDPPayload(ctx context.Context, conn stat.Connection, dis

 		conn.Write(data.Bytes())
 	})
-	defer udpServer.RemoveRay()

 	inbound := session.InboundFromContext(ctx)
 	var dest *net.Destination
--- a/proxy/socks/server.go
+++ b/proxy/socks/server.go
@@ -245,15 +245,13 @@ func (s *Server) handleUDPPayload(ctx context.Context, conn stat.Connection, dis
 		udpMessage, err := EncodeUDPPacket(request, payload.Bytes())
 		payload.Release()

+		defer udpMessage.Release()
 		if err != nil {
 			errors.LogWarningInner(ctx, err, "failed to write UDP response")
-			return
 		}
-		defer udpMessage.Release()

 		conn.Write(udpMessage.Bytes())
 	})
-	defer udpServer.RemoveRay()

 	inbound := session.InboundFromContext(ctx)
 	if inbound != nil && inbound.Source.IsValid() {
--- a/proxy/trojan/server.go
+++ b/proxy/trojan/server.go
@@ -259,7 +259,6 @@ func (s *Server) handleUDPPayload(ctx context.Context, clientReader *PacketReade
 			errors.LogWarningInner(ctx, err, "failed to write response")
 		}
 	})
-	defer udpServer.RemoveRay()

 	inbound := session.InboundFromContext(ctx)
 	user := inbound.User
--- a/proxy/vless/inbound/inbound.go
+++ b/proxy/vless/inbound/inbound.go
@@ -206,10 +206,7 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection s

 	first := buf.FromBytes(make([]byte, buf.Size))
 	first.Clear()
-	firstLen, errR := first.ReadFrom(connection)
-	if errR != nil {
-		return errR
-	}
+	firstLen, _ := first.ReadFrom(connection)
 	errors.LogInfo(ctx, "firstLen = ", firstLen)

 	reader := &buf.BufferedReader{
Author	SHA1	Message	Date
风扇滑翔翼	e22ecdcb35	Revert "Chore: Three small 'fixes'" This reverts commit `4e826abebf`.	2025-08-24 08:11:19 +00:00
dependabot[bot]	33272a0499	Bump google.golang.org/protobuf from 1.36.7 to 1.36.8 (#5042 ) Some checks failed Build and Release / build (amd64, windows, ) (push) Has been cancelled Details Build and Release / build (arm, 5, linux) (push) Has been cancelled Details Build and Release / build (arm, 6, linux) (push) Has been cancelled Details Build and Release / build (arm, 7, freebsd) (push) Has been cancelled Details Build and Release / build (arm, 7, linux) (push) Has been cancelled Details Build and Release / build (arm, 7, openbsd) (push) Has been cancelled Details Build and Release / build (arm, 7, windows) (push) Has been cancelled Details Build and Release / build (arm64, android) (push) Has been cancelled Details Build and Release / build (arm64, darwin) (push) Has been cancelled Details Build and Release / build (arm64, freebsd) (push) Has been cancelled Details Build and Release / build (arm64, linux) (push) Has been cancelled Details Build and Release / build (arm64, openbsd) (push) Has been cancelled Details Build and Release / build (arm64, windows) (push) Has been cancelled Details Build and Release / build (loong64, linux) (push) Has been cancelled Details Build and Release / build (mips, linux) (push) Has been cancelled Details Build and Release / build (mips64, linux) (push) Has been cancelled Details Build and Release / build (mips64le, linux) (push) Has been cancelled Details Build and Release / build (mipsle, linux) (push) Has been cancelled Details Build and Release / build (ppc64, linux) (push) Has been cancelled Details Build and Release / build (ppc64le, linux) (push) Has been cancelled Details Build and Release / build (riscv64, linux) (push) Has been cancelled Details Build and Release / build (s390x, linux) (push) Has been cancelled Details Build and Release for Windows 7 / build (win7-32, 386, windows) (push) Has been cancelled Details Build and Release for Windows 7 / build (win7-64, amd64, windows) (push) Has been cancelled Details Build and Release / build (386, freebsd, ) (push) Has been cancelled Details Build and Release / build (386, linux, ) (push) Has been cancelled Details Test / test (macos-latest) (push) Has been cancelled Details Test / test (ubuntu-latest) (push) Has been cancelled Details Test / test (windows-latest) (push) Has been cancelled Details Scheduled assets update / geodat (push) Has been cancelled Details Bumps google.golang.org/protobuf from 1.36.7 to 1.36.8. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-version: 1.36.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-21 10:36:38 +00:00