ping: Fix deadline for UnprivilegedConn

Author: nekohasekai

ping/socket_linux_unprivileged.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/sagernet/sing-tun/internal/gtcpip/checksum"
 	"github.com/sagernet/sing-tun/internal/gtcpip/header"
-	"github.com/sagernet/sing/common/atomic"
 	"github.com/sagernet/sing/common/buf"
 	"github.com/sagernet/sing/common/control"
 	M "github.com/sagernet/sing/common/metadata"
+	"github.com/sagernet/sing/common/pipe"
 )
 
 type UnprivilegedConn struct {
@@ -21,7 +21,7 @@ type UnprivilegedConn struct {
 	controlFunc  control.Func
 	destination  netip.Addr
 	receiveChan  chan *unprivilegedResponse
-	readDeadline atomic.TypedValue[time.Time]
+	readDeadline pipe.Deadline
 }
 
 type unprivilegedResponse struct {
@@ -53,6 +53,8 @@ func (c *UnprivilegedConn) Read(b []byte) (n int, err error) {
 		packet.Buffer.Release()
 		packet.Cmsg.Release()
 		return
+	case <-c.readDeadline.Wait():
+		return 0, os.ErrDeadlineExceeded
 	case <-c.ctx.Done():
 		return 0, os.ErrClosed
 	}
@@ -67,6 +69,8 @@ func (c *UnprivilegedConn) ReadMsg(b []byte, oob []byte) (n, oobn int, addr neti
 		packet.Buffer.Release()
 		packet.Cmsg.Release()
 		return
+	case <-c.readDeadline.Wait():
+		return 0, 0, netip.Addr{}, os.ErrDeadlineExceeded
 	case <-c.ctx.Done():
 		return 0, 0, netip.Addr{}, os.ErrClosed
 	}
@@ -85,9 +89,6 @@ func (c *UnprivilegedConn) Write(b []byte) (n int, err error) {
 		icmpHdr := header.ICMPv6(b)
 		identifier = icmpHdr.Ident()
 	}
-	if readDeadline := c.readDeadline.Load(); !readDeadline.IsZero() {
-		conn.SetReadDeadline(readDeadline)
-	}
 	n, err = conn.Write(b)
 	if err != nil {
 		conn.Close()
@@ -157,7 +158,7 @@ func (c *UnprivilegedConn) SetDeadline(t time.Time) error {
 }
 
 func (c *UnprivilegedConn) SetReadDeadline(t time.Time) error {
-	c.readDeadline.Store(t)
+	c.readDeadline.Set(t)
 	return nil
 }