Revert "Chore: Three small 'fixes'"

This reverts commit 4e826abebf.

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)
 

proxy/dns/dns.go

@@ -5,7 +5,6 @@ import (
 	go_errors "errors"
 	"io"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"github.com/xtls/xray-core/common"
@@ -370,10 +369,6 @@ type outboundConn struct {
 	access sync.Mutex
 	dialer func() (stat.Connection, error)
 
-	closeOnce sync.Once
-	dialOnce  sync.Once
-	closed    atomic.Bool
-
 	conn      net.Conn
 	connReady chan struct{}
 }
@@ -383,28 +378,24 @@ func (c *outboundConn) dial() error {
 	if err != nil {
 		return err
 	}
-	if c.closed.Load() {
-		return errors.New("connection closed during dial")
-	}
 	c.conn = conn
 	c.connReady <- struct{}{}
 	return nil
 }
 
 func (c *outboundConn) Write(b []byte) (int, error) {
-	c.dialOnce.Do(func() {
-		c.dial()
-	})
 	c.access.Lock()
-	conn := c.conn
-	c.access.Unlock()
-	if conn == nil {
-		_, open := <-c.connReady
-		if !open {
-			return 0, io.EOF
+
+	if c.conn == nil {
+		if err := c.dial(); err != nil {
+			c.access.Unlock()
+			errors.LogWarningInner(context.Background(), err, "failed to dial outbound connection")
+			return len(b), nil
 		}
-		conn = c.conn
 	}
+
+	c.access.Unlock()
+
 	return c.conn.Write(b)
 }
 
@@ -426,14 +417,11 @@ func (c *outboundConn) Read(b []byte) (int, error) {
 }
 
 func (c *outboundConn) Close() error {
-	c.closeOnce.Do(func() {
-		c.access.Lock()
-		c.closed.Store(true)
-		close(c.connReady)
-		if c.conn != nil {
-			c.conn.Close()
-		}
-		c.access.Unlock()
-	})
+	c.access.Lock()
+	close(c.connReady)
+	if c.conn != nil {
+		c.conn.Close()
+	}
+	c.access.Unlock()
 	return nil
 }

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

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() {

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

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{