refactor: udp

adapter/inbound/packet.go

@@ -2,7 +2,7 @@ package inbound
 
 import (
 	C "github.com/Dreamacro/clash/constant"
-	"github.com/Dreamacro/clash/transport/socks5"
+	M "github.com/sagernet/sing/common/metadata"
 )
 
 // PacketAdapter is a UDP Packet adapter for socks/redir/tun
@@ -17,8 +17,8 @@ func (s *PacketAdapter) Metadata() *C.Metadata {
 }
 
 // NewPacket is PacketAdapter generator
-func NewPacket(target socks5.Addr, packet C.UDPPacket, source C.Type) *PacketAdapter {
-	metadata := parseSocksAddr(target)
+func NewPacket(target M.Socksaddr, packet C.UDPPacket, source C.Type) *PacketAdapter {
+	metadata := socksAddrToMetadata(target)
 	metadata.NetWork = C.UDP
 	metadata.Type = source
 	if ip, port, err := parseAddr(packet.LocalAddr().String()); err == nil {

adapter/inbound/util.go

@@ -10,8 +10,26 @@ import (
 	"github.com/Dreamacro/clash/common/nnip"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/transport/socks5"
+	M "github.com/sagernet/sing/common/metadata"
 )
 
+func socksAddrToMetadata(addr M.Socksaddr) *C.Metadata {
+	metadata := &C.Metadata{}
+	switch addr.Family() {
+	case M.AddressFamilyIPv4:
+		metadata.AddrType = C.AtypIPv4
+		metadata.DstIP = addr.Addr
+	case M.AddressFamilyIPv6:
+		metadata.AddrType = C.AtypIPv6
+		metadata.DstIP = addr.Addr
+	case M.AddressFamilyFqdn:
+		metadata.AddrType = C.AtypDomainName
+		metadata.Host = addr.Fqdn
+	}
+	metadata.DstPort = strconv.Itoa(int(addr.Port))
+	return metadata
+}
+
 func parseSocksAddr(target socks5.Addr) *C.Metadata {
 	metadata := &C.Metadata{
 		AddrType: int(target[0]),

adapter/outbound/base.go

@@ -10,6 +10,10 @@ import (
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/gofrs/uuid"
+	"github.com/sagernet/sing/common/buf"
+	"github.com/sagernet/sing/common/bufio"
+	M "github.com/sagernet/sing/common/metadata"
+	N "github.com/sagernet/sing/common/network"
 )
 
 type Base struct {
@@ -157,6 +161,7 @@ func NewConn(c net.Conn, a C.ProxyAdapter) C.Conn {
 
 type packetConn struct {
 	net.PacketConn
+	nc                      N.PacketConn
 	chain                   C.Chain
 	actualRemoteDestination string
 }
@@ -175,8 +180,22 @@ func (c *packetConn) AppendToChains(a C.ProxyAdapter) {
 	c.chain = append(c.chain, a.Name())
 }
 
+func (c *packetConn) ReadPacket(buffer *buf.Buffer) (addr M.Socksaddr, err error) {
+	return c.nc.ReadPacket(buffer)
+}
+
+func (c *packetConn) WritePacket(buffer *buf.Buffer, addr M.Socksaddr) error {
+	return c.nc.WritePacket(buffer, addr)
+}
+
 func newPacketConn(pc net.PacketConn, a C.ProxyAdapter) C.PacketConn {
-	return &packetConn{pc, []string{a.Name()}, parseRemoteDestination(a.Addr())}
+	var nc N.PacketConn
+	if n, isNc := pc.(N.PacketConn); isNc {
+		nc = n
+	} else {
+		nc = &bufio.PacketConnWrapper{PacketConn: pc}
+	}
+	return &packetConn{pc, nc, []string{a.Name()}, parseRemoteDestination(a.Addr())}
 }
 
 func parseRemoteDestination(addr string) string {

adapter/outbound/shadowsocks.go

@@ -7,7 +7,6 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/Dreamacro/clash/common/pool"
 	"github.com/Dreamacro/clash/common/structure"
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
@@ -16,15 +15,10 @@ import (
 	v2rayObfs "github.com/Dreamacro/clash/transport/v2ray-plugin"
 	"github.com/sagernet/sing-shadowsocks"
 	"github.com/sagernet/sing-shadowsocks/shadowimpl"
-	"github.com/sagernet/sing/common/buf"
 	"github.com/sagernet/sing/common/bufio"
 	M "github.com/sagernet/sing/common/metadata"
 )
 
-func init() {
-	buf.DefaultAllocator = pool.DefaultAllocator
-}
-
 type ShadowSocks struct {
 	*Base
 	method shadowsocks.Method