Finalmask: Add header-custom (TCP & UDP), fragment (TCP), noise (UDP); Support dialer-proxy, XHTTP/3; Fix XDNS, XICMP potential panic (#5657)

https://github.com/XTLS/Xray-core/pull/5657#issuecomment-4016609446

transport/internet/udp/dialer.go

@@ -2,10 +2,12 @@ package udp
 
 import (
 	"context"
+	reflect "reflect"
 
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/errors"
 	"github.com/xtls/xray-core/common/net"
+	"github.com/xtls/xray-core/common/net/cnc"
 	"github.com/xtls/xray-core/transport/internet"
 	"github.com/xtls/xray-core/transport/internet/stat"
 )
@@ -23,18 +25,41 @@ func init() {
 			}
 
 			if streamSettings != nil && streamSettings.UdpmaskManager != nil {
-				wrapper, ok := conn.(*internet.PacketConnWrapper)
-				if !ok {
+				switch c := conn.(type) {
+				case *internet.PacketConnWrapper:
+					pktConn, err := streamSettings.UdpmaskManager.WrapPacketConnClient(c.PacketConn)
+					if err != nil {
+						conn.Close()
+						return nil, errors.New("mask err").Base(err)
+					}
+					c.PacketConn = pktConn
+				case *net.UDPConn:
+					pktConn, err := streamSettings.UdpmaskManager.WrapPacketConnClient(c)
+					if err != nil {
+						conn.Close()
+						return nil, errors.New("mask err").Base(err)
+					}
+					conn = &internet.PacketConnWrapper{
+						PacketConn: pktConn,
+						Dest:       c.RemoteAddr().(*net.UDPAddr),
+					}
+				case *cnc.Connection:
+					fakeConn := &internet.FakePacketConn{Conn: c}
+					pktConn, err := streamSettings.UdpmaskManager.WrapPacketConnClient(fakeConn)
+					if err != nil {
+						conn.Close()
+						return nil, errors.New("mask err").Base(err)
+					}
+					conn = &internet.PacketConnWrapper{
+						PacketConn: pktConn,
+						Dest: &net.UDPAddr{
+							IP:   []byte{0, 0, 0, 0},
+							Port: 0,
+						},
+					}
+				default:
 					conn.Close()
-					return nil, errors.New("conn is not PacketConnWrapper")
-				}
-
-				raw := wrapper.Conn
-
-				wrapper.Conn, err = streamSettings.UdpmaskManager.WrapPacketConnClient(raw)
-				if err != nil {
-					raw.Close()
-					return nil, errors.New("mask err").Base(err)
+					return nil, errors.New("unknown conn ", reflect.TypeOf(c))
 				}
 			}