[dependencies] Update module golang.org/x/sys to v0.14.0 - autoclosed

common/bufio/nat.go

@@ -9,54 +9,95 @@ import (
 	N "github.com/sagernet/sing/common/network"
 )
 
-type NATPacketConn struct {
+type NATPacketConn interface {
 	N.NetPacketConn
-	origin      M.Socksaddr
-	destination M.Socksaddr
+	UpdateDestination(destinationAddress netip.Addr)
 }
 
-func NewNATPacketConn(conn N.NetPacketConn, origin M.Socksaddr, destination M.Socksaddr) *NATPacketConn {
-	return &NATPacketConn{
+func NewUnidirectionalNATPacketConn(conn N.NetPacketConn, origin M.Socksaddr, destination M.Socksaddr) NATPacketConn {
+	return &unidirectionalNATPacketConn{
 		NetPacketConn: conn,
 		origin:        origin,
 		destination:   destination,
 	}
 }
 
-func (c *NATPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
+func NewNATPacketConn(conn N.NetPacketConn, origin M.Socksaddr, destination M.Socksaddr) NATPacketConn {
+	return &bidirectionalNATPacketConn{
+		NetPacketConn: conn,
+		origin:        origin,
+		destination:   destination,
+	}
+}
+
+type unidirectionalNATPacketConn struct {
+	N.NetPacketConn
+	origin      M.Socksaddr
+	destination M.Socksaddr
+}
+
+func (c *unidirectionalNATPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
+	if M.SocksaddrFromNet(addr) == c.destination {
+		addr = c.origin.UDPAddr()
+	}
+	return c.NetPacketConn.WriteTo(p, addr)
+}
+
+func (c *unidirectionalNATPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
+	if destination == c.destination {
+		destination = c.origin
+	}
+	return c.NetPacketConn.WritePacket(buffer, destination)
+}
+
+func (c *unidirectionalNATPacketConn) UpdateDestination(destinationAddress netip.Addr) {
+	c.destination = M.SocksaddrFrom(destinationAddress, c.destination.Port)
+}
+
+func (c *unidirectionalNATPacketConn) Upstream() any {
+	return c.NetPacketConn
+}
+
+type bidirectionalNATPacketConn struct {
+	N.NetPacketConn
+	origin      M.Socksaddr
+	destination M.Socksaddr
+}
+
+func (c *bidirectionalNATPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
 	n, addr, err = c.NetPacketConn.ReadFrom(p)
 	if err == nil && M.SocksaddrFromNet(addr) == c.origin {
 		addr = c.destination.UDPAddr()
 	}
 	return
 }
 
-func (c *NATPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
+func (c *bidirectionalNATPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
 	if M.SocksaddrFromNet(addr) == c.destination {
 		addr = c.origin.UDPAddr()
 	}
 	return c.NetPacketConn.WriteTo(p, addr)
 }
 
-func (c *NATPacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Socksaddr, err error) {
+func (c *bidirectionalNATPacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Socksaddr, err error) {
 	destination, err = c.NetPacketConn.ReadPacket(buffer)
 	if destination == c.origin {
 		destination = c.destination
 	}
 	return
 }
 
-func (c *NATPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
+func (c *bidirectionalNATPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
 	if destination == c.destination {
 		destination = c.origin
 	}
 	return c.NetPacketConn.WritePacket(buffer, destination)
 }
 
-func (c *NATPacketConn) UpdateDestination(destinationAddress netip.Addr) {
+func (c *bidirectionalNATPacketConn) UpdateDestination(destinationAddress netip.Addr) {
 	c.destination = M.SocksaddrFrom(destinationAddress, c.destination.Port)
 }
 
-func (c *NATPacketConn) Upstream() any {
+func (c *bidirectionalNATPacketConn) Upstream() any {
 	return c.NetPacketConn
 }

go.mod

@@ -2,4 +2,4 @@ module github.com/sagernet/sing
 
 go 1.18
 
-require golang.org/x/sys v0.13.0
+require golang.org/x/sys v0.14.0

go.sum

@@ -1,2 +1,4 @@
 golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=