Finalmask: Add XDNS (relies mKCP, like DNSTT), header-*, mkcp-* (#5560)

And https://github.com/XTLS/Xray-core/pull/5560#issuecomment-3825430761
2026-07-11 14:18:53 +00:00 · 2026-01-31 21:53:19 +08:00
parent 5b849d51a9
commit c180c5980c
92 changed files with 5549 additions and 2060 deletions
@@ -0,0 +1,16 @@
+package wireguard
+
+import (
+	"net"
+)
+
+func (c *Config) UDP() {
+}
+
+func (c *Config) WrapPacketConnClient(raw net.PacketConn, first bool, leaveSize int32, end bool) (net.PacketConn, error) {
+	return NewConnClient(c, raw, first, leaveSize)
+}
+
+func (c *Config) WrapPacketConnServer(raw net.PacketConn, first bool, leaveSize int32, end bool) (net.PacketConn, error) {
+	return NewConnServer(c, raw, first, leaveSize)
+}
@@ -0,0 +1,114 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.36.10
+// 	protoc        v6.33.1
+// source: transport/internet/finalmask/header/wireguard/config.proto
+
+package wireguard
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+	unsafe "unsafe"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type Config struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *Config) Reset() {
+	*x = Config{}
+	mi := &file_transport_internet_finalmask_header_wireguard_config_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *Config) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Config) ProtoMessage() {}
+
+func (x *Config) ProtoReflect() protoreflect.Message {
+	mi := &file_transport_internet_finalmask_header_wireguard_config_proto_msgTypes[0]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Config.ProtoReflect.Descriptor instead.
+func (*Config) Descriptor() ([]byte, []int) {
+	return file_transport_internet_finalmask_header_wireguard_config_proto_rawDescGZIP(), []int{0}
+}
+
+var File_transport_internet_finalmask_header_wireguard_config_proto protoreflect.FileDescriptor
+
+const file_transport_internet_finalmask_header_wireguard_config_proto_rawDesc = "" +
+	"\n" +
+	":transport/internet/finalmask/header/wireguard/config.proto\x122xray.transport.internet.finalmask.header.wireguard\"\b\n" +
+	"\x06ConfigB\xb8\x01\n" +
+	"6com.xray.transport.internet.finalmask.header.wireguardP\x01ZGgithub.com/xtls/xray-core/transport/internet/finalmask/header/wireguard\xaa\x022Xray.Transport.Internet.Finalmask.Header.Wireguardb\x06proto3"
+
+var (
+	file_transport_internet_finalmask_header_wireguard_config_proto_rawDescOnce sync.Once
+	file_transport_internet_finalmask_header_wireguard_config_proto_rawDescData []byte
+)
+
+func file_transport_internet_finalmask_header_wireguard_config_proto_rawDescGZIP() []byte {
+	file_transport_internet_finalmask_header_wireguard_config_proto_rawDescOnce.Do(func() {
+		file_transport_internet_finalmask_header_wireguard_config_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_transport_internet_finalmask_header_wireguard_config_proto_rawDesc), len(file_transport_internet_finalmask_header_wireguard_config_proto_rawDesc)))
+	})
+	return file_transport_internet_finalmask_header_wireguard_config_proto_rawDescData
+}
+
+var file_transport_internet_finalmask_header_wireguard_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_transport_internet_finalmask_header_wireguard_config_proto_goTypes = []any{
+	(*Config)(nil), // 0: xray.transport.internet.finalmask.header.wireguard.Config
+}
+var file_transport_internet_finalmask_header_wireguard_config_proto_depIdxs = []int32{
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_transport_internet_finalmask_header_wireguard_config_proto_init() }
+func file_transport_internet_finalmask_header_wireguard_config_proto_init() {
+	if File_transport_internet_finalmask_header_wireguard_config_proto != nil {
+		return
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_transport_internet_finalmask_header_wireguard_config_proto_rawDesc), len(file_transport_internet_finalmask_header_wireguard_config_proto_rawDesc)),
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_transport_internet_finalmask_header_wireguard_config_proto_goTypes,
+		DependencyIndexes: file_transport_internet_finalmask_header_wireguard_config_proto_depIdxs,
+		MessageInfos:      file_transport_internet_finalmask_header_wireguard_config_proto_msgTypes,
+	}.Build()
+	File_transport_internet_finalmask_header_wireguard_config_proto = out.File
+	file_transport_internet_finalmask_header_wireguard_config_proto_goTypes = nil
+	file_transport_internet_finalmask_header_wireguard_config_proto_depIdxs = nil
+}
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package xray.transport.internet.finalmask.header.wireguard;
+option csharp_namespace = "Xray.Transport.Internet.Finalmask.Header.Wireguard";
+option go_package = "github.com/xtls/xray-core/transport/internet/finalmask/header/wireguard";
+option java_package = "com.xray.transport.internet.finalmask.header.wireguard";
+option java_multiple_files = true;
+
+message Config {}
@@ -0,0 +1,155 @@
+package wireguard
+
+import (
+	"io"
+	"net"
+	sync "sync"
+	"time"
+
+	"github.com/xtls/xray-core/common/errors"
+)
+
+type wireguare struct{}
+
+func (*wireguare) Size() int32 {
+	return 4
+}
+
+func (h *wireguare) Serialize(b []byte) {
+	b[0] = 0x04
+	b[1] = 0x00
+	b[2] = 0x00
+	b[3] = 0x00
+}
+
+type wireguareConn struct {
+	first     bool
+	leaveSize int32
+
+	conn   net.PacketConn
+	header *wireguare
+
+	readBuf    []byte
+	readMutex  sync.Mutex
+	writeBuf   []byte
+	writeMutex sync.Mutex
+}
+
+func NewConnClient(c *Config, raw net.PacketConn, first bool, leaveSize int32) (net.PacketConn, error) {
+	conn := &wireguareConn{
+		first:     first,
+		leaveSize: leaveSize,
+
+		conn:   raw,
+		header: &wireguare{},
+	}
+
+	if first {
+		conn.readBuf = make([]byte, 8192)
+		conn.writeBuf = make([]byte, 8192)
+	}
+
+	return conn, nil
+}
+
+func NewConnServer(c *Config, raw net.PacketConn, first bool, leaveSize int32) (net.PacketConn, error) {
+	return NewConnClient(c, raw, first, leaveSize)
+}
+
+func (c *wireguareConn) Size() int32 {
+	return c.header.Size()
+}
+
+func (c *wireguareConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
+	if c.first {
+		c.readMutex.Lock()
+
+		n, addr, err = c.conn.ReadFrom(c.readBuf)
+		if err != nil {
+			c.readMutex.Unlock()
+			return n, addr, err
+		}
+
+		if n < int(c.Size()) {
+			c.readMutex.Unlock()
+			return 0, addr, errors.New("header").Base(io.ErrShortBuffer)
+		}
+
+		if len(p) < n-int(c.Size()) {
+			c.readMutex.Unlock()
+			return 0, addr, errors.New("header").Base(io.ErrShortBuffer)
+		}
+
+		copy(p, c.readBuf[c.Size():n])
+
+		c.readMutex.Unlock()
+		return n - int(c.Size()), addr, err
+	}
+
+	n, addr, err = c.conn.ReadFrom(p)
+	if err != nil {
+		return n, addr, err
+	}
+
+	if n < int(c.Size()) {
+		return 0, addr, errors.New("header").Base(io.ErrShortBuffer)
+	}
+
+	copy(p, p[c.Size():n])
+
+	return n - int(c.Size()), addr, err
+}
+
+func (c *wireguareConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
+	if c.first {
+		if c.leaveSize+c.Size()+int32(len(p)) > 8192 {
+			return 0, errors.New("too many masks")
+		}
+
+		c.writeMutex.Lock()
+
+		n = copy(c.writeBuf[c.leaveSize+c.Size():], p)
+		n += int(c.leaveSize) + int(c.Size())
+
+		c.header.Serialize(c.writeBuf[c.leaveSize : c.leaveSize+c.Size()])
+
+		nn, err := c.conn.WriteTo(c.writeBuf[:n], addr)
+
+		if err != nil {
+			c.writeMutex.Unlock()
+			return 0, err
+		}
+
+		if nn != n {
+			c.writeMutex.Unlock()
+			return 0, errors.New("nn != n")
+		}
+
+		c.writeMutex.Unlock()
+		return len(p), nil
+	}
+
+	c.header.Serialize(p[c.leaveSize : c.leaveSize+c.Size()])
+
+	return c.conn.WriteTo(p, addr)
+}
+
+func (c *wireguareConn) Close() error {
+	return c.conn.Close()
+}
+
+func (c *wireguareConn) LocalAddr() net.Addr {
+	return c.conn.LocalAddr()
+}
+
+func (c *wireguareConn) SetDeadline(t time.Time) error {
+	return c.conn.SetDeadline(t)
+}
+
+func (c *wireguareConn) SetReadDeadline(t time.Time) error {
+	return c.conn.SetReadDeadline(t)
+}
+
+func (c *wireguareConn) SetWriteDeadline(t time.Time) error {
+	return c.conn.SetWriteDeadline(t)
+}