XDRIVE transport: Retry "local" Get on Windows sharing violations

On Windows, os.Rename (MoveFileEx) opens the file with DELETE access, renames it, then closes that handle. For a moment the new name is already listed while the handle is still open, and os.ReadFile, which shares only reading and writing, fails with ERROR_SHARING_VIOLATION. The WAL reader lists a segment as soon as Put renames it into place, and any Get error other than "not found" ends the stream: xdrive_test.go:143: ReadFull: transport/internet/xdrive: failed to read streams/<id>/c2s/000000001.seg > open ...\000000001.seg: The process cannot access the file because it is being used by another process. Measured on Windows 11 (Defender real-time protection on, 22 logical CPUs) with a reader that keeps opening the new name during the rename: 98.6% of 5,001 renames hit the error, every failed open started before MoveFileEx returned, and none failed with FILE_SHARE_DELETE added to the open. The window is about 0.3 ms when idle, but 10 ms median and up to 124 ms with all CPUs busy, which is why it shows up in full `go test ./...` runs. Under such load (22 busy-loop processes) the unfixed TestMultiSegmentTransfer, TestRoundTrip, TestInterleaved and TestCloseEOF failed 4 of 60 runs; with this change, 0 of 120. Get now retries os.ReadFile on ERROR_SHARING_VIOLATION for up to 2 seconds, as cmd/internal/robustio does, backing off from 1 ms to 100 ms and returning early once ctx is done. Other platforms still call os.ReadFile once. TestLocalSharingViolation holds a segment open with DELETE access, as MoveFileEx does, and checks that Get waits for it. Opening with FILE_SHARE_DELETE would avoid the conflict, but os.Open cannot set the share mode, and a raw CreateFile would lose its long path handling. Put's rename is unchanged: no rename failed in about 63,000 renames during these measurements, idle or under load. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 02:07:17 +00:00 · 2026-11-02 12:23:24 +03:30
25 changed files with 343 additions and 934 deletions
@@ -20,7 +20,7 @@ RUN cat <<EOF >/tmp/usr/local/etc/xray/00_log.json
 {
  "log": {
    "error": "/var/log/xray/error.log",
-    "logLevel": "warning",
+    "loglevel": "warning",
    "access": "none",
    "dnsLog": false
  }
@@ -20,7 +20,7 @@ RUN cat <<EOF >/tmp/usr/local/etc/xray/00_log.json
 {
  "log": {
    "error": "/var/log/xray/error.log",
-    "logLevel": "warning",
+    "loglevel": "warning",
    "access": "none",
    "dnsLog": false
  }
@@ -134,7 +134,7 @@ func TestMarshalConfigJson(t *testing.T) {
 func getConfig() string {
 	return `{
  "log": {
-    "logLevel": "debug"
+    "loglevel": "debug"
  },
  "stats": {},
  "policy": {
@@ -10,7 +10,7 @@ require (
 	github.com/google/go-cmp v0.7.0
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
-	github.com/klauspost/cpuid/v2 v2.4.2
+	github.com/klauspost/cpuid/v2 v2.4.1
 	github.com/libp2p/go-nat v1.0.1-0.20250821073202-01afc089f138
 	github.com/miekg/dns v1.1.73
 	github.com/pelletier/go-toml v1.9.5
@@ -35,8 +35,8 @@ github.com/juju/ratelimit v1.0.2 h1:sRxmtRiajbvrcLQT7S+JbqU0ntsb9W2yhSdNN8tWfaI=
 github.com/juju/ratelimit v1.0.2/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk=
 github.com/klauspost/compress v1.20.0 h1:a3C1ke2ohxFymNlb2HWAHjDeKCI90scRskErZkR0ezA=
 github.com/klauspost/compress v1.20.0/go.mod h1:LUdAzn7YLVvxLpc7y3V1m40wESHTgc1422pwwBSKYuI=
-github.com/klauspost/cpuid/v2 v2.4.2 h1:xRw7IZEsAgVCp6trS/DgWbTAqpixhmywgVgBjYGg1bQ=
-github.com/klauspost/cpuid/v2 v2.4.2/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU=
+github.com/klauspost/cpuid/v2 v2.4.1 h1:I9KxadAkvo+QjtcEE2f2tyfEvmIla/T0m+14PrZNl0U=
+github.com/klauspost/cpuid/v2 v2.4.1/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU=
 github.com/koron/go-ssdp v0.0.4 h1:1IDwrghSKYM7yLf7XCzbByg2sJ/JcNOZRXS2jczTwz0=
 github.com/koron/go-ssdp v0.0.4/go.mod h1:oDXq+E5IL5q0U8uSBcoAXzTzInwy5lEgC91HoKtbmZk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -9,7 +9,6 @@ import (

 	"github.com/xtls/xray-core/common/errors"
 	"github.com/xtls/xray-core/common/geodata"
-	"github.com/xtls/xray-core/common/log"
 	xnet "github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/common/protocol"
 	"github.com/xtls/xray-core/proxy/freedom"
@@ -49,8 +48,6 @@ type FreedomFinalRuleConfig struct {
 	Network    *NetworkList `json:"network"`
 	Port       *PortList    `json:"port"`
 	IP         *StringList  `json:"ip"`
-	Delay      *Int32Range  `json:"delay"`
-	LogLevel   string       `json:"logLevel"`
 	BlockDelay *Int32Range  `json:"blockDelay"`
 }

@@ -283,37 +280,10 @@ func (c *FreedomFinalRuleConfig) Build() (*freedom.FinalRuleConfig, error) {
 	}

 	if c.BlockDelay != nil {
-		errors.PrintDeprecatedFeatureWarning("finalRules.blockDelay", "finalRules.delay")
-		c.Delay = c.BlockDelay
-	}
-
-	if rule.Action != freedom.RuleAction_Block {
-		if c.Delay != nil || c.LogLevel != "" {
-			return nil, errors.New("delay and logLevel are only supported for block finalRules")
+		rule.BlockDelay = &freedom.Range{
+			Min: uint64(c.BlockDelay.From),
+			Max: uint64(c.BlockDelay.To),
 		}
-		return rule, nil
-	}
-
-	if c.Delay != nil {
-		rule.Delay = &freedom.Range{
-			Min: uint64(c.Delay.From),
-			Max: uint64(c.Delay.To),
-		}
-	}
-
-	switch strings.ToLower(c.LogLevel) {
-	case "", "info":
-		rule.LogLevel = log.Severity_Info.Enum()
-	case "none":
-		rule.LogLevel = log.Severity_Unknown.Enum()
-	case "debug":
-		rule.LogLevel = log.Severity_Debug.Enum()
-	case "warning":
-		rule.LogLevel = log.Severity_Warning.Enum()
-	case "error":
-		rule.LogLevel = log.Severity_Error.Enum()
-	default:
-		return nil, errors.New("unknown finalRules.logLevel: ", c.LogLevel)
 	}

 	return rule, nil
@@ -4,7 +4,6 @@ import (
 	"testing"

 	"github.com/xtls/xray-core/common/geodata"
-	"github.com/xtls/xray-core/common/log"
 	"github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/common/protocol"
 	. "github.com/xtls/xray-core/infra/conf"
@@ -47,8 +46,7 @@ func TestFreedomConfig(t *testing.T) {
 					"network": "tcp,udp",
 					"port": "53,443",
 					"ip": ["10.0.0.0/8", "2001:db8::/32"],
-					"delay": "30-60",
-					"logLevel": "debug"
+					"blockDelay": "30-60"
 				}, {
 					"action": "allow",
 					"network": ["udp"]
@@ -88,8 +86,10 @@ func TestFreedomConfig(t *testing.T) {
 								},
 							},
 						},
-						Delay:    &freedom.Range{Min: 30, Max: 60},
-						LogLevel: log.Severity_Debug.Enum(),
+						BlockDelay: &freedom.Range{
+							Min: 30,
+							Max: 60,
+						},
 					},
 					{
 						Action:   freedom.RuleAction_Allow,
@@ -18,7 +18,7 @@ func DefaultLogConfig() *log.Config {
 type LogConfig struct {
 	AccessLog   string `json:"access"`
 	ErrorLog    string `json:"error"`
-	LogLevel    string `json:"logLevel"`
+	LogLevel    string `json:"loglevel"`
 	DNSLog      bool   `json:"dnsLog"`
 	MaskAddress string `json:"maskAddress"`
 }
@@ -18,7 +18,7 @@ func TestLoaderError(t *testing.T) {
 				"log": {
 					// abcd
 					0,
-					"logLevel": "info"
+					"loglevel": "info"
 				}
 		}`,
 			Output: "line 4 char 6",
@@ -27,7 +27,7 @@ func TestLoaderError(t *testing.T) {
 			Input: `{
 				"log": {
 					// abcd
-					"logLevel": "info",
+					"loglevel": "info",
 				}
 		}`,
 			Output: "line 5 char 5",
@@ -52,7 +52,7 @@ func (v *TunConfig) Build() (proto.Message, error) {
 			return nil, errors.New("autoSystemWfpBlockLeak needs autoSystemRoutingTable to be set")
 		}
 		if tun.BlocksSystemDNS(leaks) && len(v.DNS) == 0 {
-			return nil, errors.New(`autoSystemWfpBlockLeak "all", "allexceptlan", "dns", "windnsclient", or TCP or UDP port 53, needs dns to be set`)
+			return nil, errors.New(`autoSystemWfpBlockLeak "dns", "udp/53", "tcp/53" or "windnsclient" needs dns to be set`)
 		}
 	case "linux", "freebsd":
 		if v.AutoSystemDnsToGateway && len(v.Gateway) == 0 {
@@ -29,38 +29,18 @@ func TestTunConfigAutoSystem(t *testing.T) {
 		{
 			Input:  `{"name": "xray0", "dns": ["1.1.1.1"], "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["dns", "misconfigtun"]}`,
 			Parser: loadJSON(creator),
-			Output: &tun.Config{Name: "xray0", Desc: "Wintun", MTU: 1500, DNS: []string{"1.1.1.1"}, AutoSystemRoutingTable: []string{"0.0.0.0/0"}, AutoOutboundsInterface: "auto", AutoSystemWfpBlockLeak: []string{"53", "853", "windnsclient", "misconfigtun"}},
+			Output: &tun.Config{Name: "xray0", Desc: "Wintun", MTU: 1500, DNS: []string{"1.1.1.1"}, AutoSystemRoutingTable: []string{"0.0.0.0/0"}, AutoOutboundsInterface: "auto", AutoSystemWfpBlockLeak: []string{"udp/53", "tcp/53", "windnsclient", "tcp/853", "udp/853", "misconfigtun"}},
 		},
 		{
 			Input:  `{"name": "xray0", "dns": ["1.1.1.1"], "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["DNS"]}`,
 			Parser: loadJSON(creator),
-			Output: &tun.Config{Name: "xray0", Desc: "Wintun", MTU: 1500, DNS: []string{"1.1.1.1"}, AutoSystemRoutingTable: []string{"0.0.0.0/0"}, AutoOutboundsInterface: "auto", AutoSystemWfpBlockLeak: []string{"53", "853", "windnsclient"}},
+			Output: &tun.Config{Name: "xray0", Desc: "Wintun", MTU: 1500, DNS: []string{"1.1.1.1"}, AutoSystemRoutingTable: []string{"0.0.0.0/0"}, AutoOutboundsInterface: "auto", AutoSystemWfpBlockLeak: []string{"udp/53", "tcp/53", "windnsclient", "tcp/853", "udp/853"}},
 		},
 		{
 			Input:  `{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["TCP/853", "udp/853", "tcp/0853"]}`,
 			Parser: loadJSON(creator),
 			Output: &tun.Config{Name: "xray0", Desc: "Wintun", MTU: 1500, AutoSystemRoutingTable: []string{"0.0.0.0/0"}, AutoOutboundsInterface: "auto", AutoSystemWfpBlockLeak: []string{"tcp/853", "udp/853"}},
 		},
-		{
-			Input:  `{"name": "xray0", "dns": ["1.1.1.1"], "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["All", "UDP", "tcp/8000-9000", "icmp"]}`,
-			Parser: loadJSON(creator),
-			Output: &tun.Config{Name: "xray0", Desc: "Wintun", MTU: 1500, DNS: []string{"1.1.1.1"}, AutoSystemRoutingTable: []string{"0.0.0.0/0"}, AutoOutboundsInterface: "auto", AutoSystemWfpBlockLeak: []string{"all", "udp", "tcp/8000-9000", "icmp"}},
-		},
-		{
-			Input:  `{"name": "xray0", "dns": ["1.1.1.1"], "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["AllExceptLAN"]}`,
-			Parser: loadJSON(creator),
-			Output: &tun.Config{Name: "xray0", Desc: "Wintun", MTU: 1500, DNS: []string{"1.1.1.1"}, AutoSystemRoutingTable: []string{"0.0.0.0/0"}, AutoOutboundsInterface: "auto", AutoSystemWfpBlockLeak: []string{"allexceptlan", "53", "853", "windnsclient"}},
-		},
-		{
-			Input:  `{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["1.1.1.1/24:TCP/853", "[2001:DB8::/32]:udp/10-20", "[::/0]:ICMP", "853"]}`,
-			Parser: loadJSON(creator),
-			Output: &tun.Config{Name: "xray0", Desc: "Wintun", MTU: 1500, AutoSystemRoutingTable: []string{"0.0.0.0/0"}, AutoOutboundsInterface: "auto", AutoSystemWfpBlockLeak: []string{"1.1.1.0/24:tcp/853", "[2001:db8::/32]:udp/10-20", "[::/0]:icmp", "853"}},
-		},
-		{
-			Input:  `{"name": "xray0", "dns": ["1.1.1.1"], "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["0.0.0.0/0:dns", "[::/0]:All", "53"]}`,
-			Parser: loadJSON(creator),
-			Output: &tun.Config{Name: "xray0", Desc: "Wintun", MTU: 1500, DNS: []string{"1.1.1.1"}, AutoSystemRoutingTable: []string{"0.0.0.0/0"}, AutoOutboundsInterface: "auto", AutoSystemWfpBlockLeak: []string{"0.0.0.0/0:53", "0.0.0.0/0:853", "0.0.0.0/0:windnsclient", "[::/0]:all", "53"}},
-		},
 	})
 }

@@ -77,21 +57,6 @@ func TestTunConfigAutoSystemNeeds(t *testing.T) {
 		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["udp/53"]}`, []string{"windows"}},
 		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["windnsclient"]}`, []string{"windows"}},
 		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["tcp/853", "udp/853"]}`, nil},
-		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["all"]}`, []string{"windows"}},
-		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["udp"]}`, []string{"windows"}},
-		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["tcp/50-60"]}`, []string{"windows"}},
-		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["tcp/54-60", "icmp"]}`, nil},
-		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["53"]}`, []string{"windows"}},
-		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["50-60"]}`, []string{"windows"}},
-		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["[::/0]:udp/53"]}`, []string{"windows"}},
-		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["1.1.1.1/32:dns"]}`, []string{"windows"}},
-		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["[2001:db8::/32]:all"]}`, []string{"windows"}},
-		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["0.0.0.0/0:windnsclient"]}`, []string{"windows"}},
-		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["0.0.0.0/0:tcp/853", "1.1.1.0/24:icmp", "[::/0]:misconfigtun", "54-60"]}`, nil},
-		{`{"name": "xray0", "autoSystemWfpBlockLeak": ["[::/0]:misconfigtun"]}`, []string{"windows"}},
-		{`{"name": "xray0", "autoSystemWfpBlockLeak": ["all"]}`, []string{"windows"}},
-		{`{"name": "xray0", "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["allexceptlan"]}`, []string{"windows"}},
-		{`{"name": "xray0", "dns": ["1.1.1.1"], "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["allexceptlan"]}`, nil},
 		{`{"name": "xray0", "autoSystemDnsToGateway": true}`, []string{"linux", "freebsd"}},
 	} {
 		config := new(TunConfig)
@@ -105,21 +70,12 @@ func TestTunConfigAutoSystemNeeds(t *testing.T) {
 }

 func TestTunConfigAutoSystemWfpBlockLeakUnknown(t *testing.T) {
-	// With the settings the values need on Windows, so that only an unknown
-	// one fails.
-	build := func(value string) error {
+	for _, value := range []string{"ip", "tcp/0", "icmp/1"} {
 		config := new(TunConfig)
-		if err := json.Unmarshal([]byte(`{"name": "xray0", "dns": ["1.1.1.1"], "autoSystemRoutingTable": ["0.0.0.0/0"], "autoSystemWfpBlockLeak": ["dns", "`+value+`"]}`), config); err != nil {
+		if err := json.Unmarshal([]byte(`{"name": "xray0", "autoSystemWfpBlockLeak": ["dns", "`+value+`"]}`), config); err != nil {
 			t.Fatal(err)
 		}
-		_, err := config.Build()
-		return err
-	}
-	if err := build("1.1.1.0/24:53"); err != nil {
-		t.Fatal(err)
-	}
-	for _, value := range []string{"ip", "tcp/0", "tcp/0-10", "icmp/1", "udp/20-10", "0", "20-10", "53/tcp", "tcpv4", "ipv4:udp", "1.1.1.1:53", "2001:db8::/32:53", "[1.1.1.0/24]:53", "[::ffff:1.1.1.0/120]:53", "1.1.1.0/24"} {
-		if build(value) == nil {
+		if _, err := config.Build(); err == nil {
 			t.Errorf("autoSystemWfpBlockLeak value %q was accepted", value)
 		}
 	}
@@ -42,7 +42,7 @@ func TestXrayConfig(t *testing.T) {
 			Input: `{
 				"log": {
 					"access": "/var/log/xray/access.log",
-					"logLevel": "error",
+					"loglevel": "error",
 					"error": "/var/log/xray/error.log"
 				},
 				"inbounds": [{
@@ -8,7 +8,6 @@ package freedom

 import (
 	geodata "github.com/xtls/xray-core/common/geodata"
-	log "github.com/xtls/xray-core/common/log"
 	net "github.com/xtls/xray-core/common/net"
 	protocol "github.com/xtls/xray-core/common/protocol"
 	internet "github.com/xtls/xray-core/transport/internet"
@@ -358,8 +357,7 @@ type FinalRuleConfig struct {
 	Networks      []net.Network          `protobuf:"varint,2,rep,packed,name=networks,proto3,enum=xray.common.net.Network" json:"networks,omitempty"`
 	PortList      *net.PortList          `protobuf:"bytes,3,opt,name=port_list,json=portList,proto3" json:"port_list,omitempty"`
 	Ip            []*geodata.IPRule      `protobuf:"bytes,4,rep,name=ip,proto3" json:"ip,omitempty"`
-	Delay         *Range                 `protobuf:"bytes,5,opt,name=delay,proto3" json:"delay,omitempty"`
-	LogLevel      *log.Severity          `protobuf:"varint,6,opt,name=log_level,json=logLevel,proto3,enum=xray.common.log.Severity,oneof" json:"log_level,omitempty"`
+	BlockDelay    *Range                 `protobuf:"bytes,5,opt,name=block_delay,json=blockDelay,proto3" json:"block_delay,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -422,20 +420,13 @@ func (x *FinalRuleConfig) GetIp() []*geodata.IPRule {
 	return nil
 }

-func (x *FinalRuleConfig) GetDelay() *Range {
+func (x *FinalRuleConfig) GetBlockDelay() *Range {
 	if x != nil {
-		return x.Delay
+		return x.BlockDelay
 	}
 	return nil
 }

-func (x *FinalRuleConfig) GetLogLevel() log.Severity {
-	if x != nil && x.LogLevel != nil {
-		return *x.LogLevel
-	}
-	return log.Severity(0)
-}
-
 type Config struct {
 	state               protoimpl.MessageState  `protogen:"open.v1"`
 	DomainStrategy      internet.DomainStrategy `protobuf:"varint,1,opt,name=domain_strategy,json=domainStrategy,proto3,enum=xray.transport.internet.DomainStrategy" json:"domain_strategy,omitempty"`
@@ -532,7 +523,7 @@ var File_proxy_freedom_config_proto protoreflect.FileDescriptor

 const file_proxy_freedom_config_proto_rawDesc = "" +
 	"\n" +
-	"\x1aproxy/freedom/config.proto\x12\x12xray.proxy.freedom\x1a!common/protocol/server_spec.proto\x1a\x1ftransport/internet/config.proto\x1a\x15common/net/port.proto\x1a\x18common/net/network.proto\x1a\x1bcommon/geodata/geodat.proto\x1a\x14common/log/log.proto\"S\n" +
+	"\x1aproxy/freedom/config.proto\x12\x12xray.proxy.freedom\x1a!common/protocol/server_spec.proto\x1a\x1ftransport/internet/config.proto\x1a\x15common/net/port.proto\x1a\x18common/net/network.proto\x1a\x1bcommon/geodata/geodat.proto\"S\n" +
 	"\x13DestinationOverride\x12<\n" +
 	"\x06server\x18\x01 \x01(\v2$.xray.common.protocol.ServerEndpointR\x06server\"\x98\x02\n" +
 	"\bFragment\x12!\n" +
@@ -558,16 +549,14 @@ const file_proxy_freedom_config_proto_rawDesc = "" +
 	"\bapply_to\x18\x06 \x01(\tR\aapplyTo\"+\n" +
 	"\x05Range\x12\x10\n" +
 	"\x03min\x18\x01 \x01(\x04R\x03min\x12\x10\n" +
-	"\x03max\x18\x02 \x01(\x04R\x03max\"\xe0\x02\n" +
+	"\x03max\x18\x02 \x01(\x04R\x03max\"\xa0\x02\n" +
 	"\x0fFinalRuleConfig\x126\n" +
 	"\x06action\x18\x01 \x01(\x0e2\x1e.xray.proxy.freedom.RuleActionR\x06action\x124\n" +
 	"\bnetworks\x18\x02 \x03(\x0e2\x18.xray.common.net.NetworkR\bnetworks\x126\n" +
 	"\tport_list\x18\x03 \x01(\v2\x19.xray.common.net.PortListR\bportList\x12+\n" +
-	"\x02ip\x18\x04 \x03(\v2\x1b.xray.common.geodata.IPRuleR\x02ip\x12/\n" +
-	"\x05delay\x18\x05 \x01(\v2\x19.xray.proxy.freedom.RangeR\x05delay\x12;\n" +
-	"\tlog_level\x18\x06 \x01(\x0e2\x19.xray.common.log.SeverityH\x00R\blogLevel\x88\x01\x01B\f\n" +
-	"\n" +
-	"_log_level\"\xaf\x03\n" +
+	"\x02ip\x18\x04 \x03(\v2\x1b.xray.common.geodata.IPRuleR\x02ip\x12:\n" +
+	"\vblock_delay\x18\x05 \x01(\v2\x19.xray.proxy.freedom.RangeR\n" +
+	"blockDelay\"\xaf\x03\n" +
 	"\x06Config\x12P\n" +
 	"\x0fdomain_strategy\x18\x01 \x01(\x0e2'.xray.transport.internet.DomainStrategyR\x0edomainStrategy\x12Z\n" +
 	"\x14destination_override\x18\x03 \x01(\v2'.xray.proxy.freedom.DestinationOverrideR\x13destinationOverride\x12\x1d\n" +
@@ -610,8 +599,7 @@ var file_proxy_freedom_config_proto_goTypes = []any{
 	(net.Network)(0),                // 8: xray.common.net.Network
 	(*net.PortList)(nil),            // 9: xray.common.net.PortList
 	(*geodata.IPRule)(nil),          // 10: xray.common.geodata.IPRule
-	(log.Severity)(0),               // 11: xray.common.log.Severity
-	(internet.DomainStrategy)(0),    // 12: xray.transport.internet.DomainStrategy
+	(internet.DomainStrategy)(0),    // 11: xray.transport.internet.DomainStrategy
 }
 var file_proxy_freedom_config_proto_depIdxs = []int32{
 	7,  // 0: xray.proxy.freedom.DestinationOverride.server:type_name -> xray.common.protocol.ServerEndpoint
@@ -619,18 +607,17 @@ var file_proxy_freedom_config_proto_depIdxs = []int32{
 	8,  // 2: xray.proxy.freedom.FinalRuleConfig.networks:type_name -> xray.common.net.Network
 	9,  // 3: xray.proxy.freedom.FinalRuleConfig.port_list:type_name -> xray.common.net.PortList
 	10, // 4: xray.proxy.freedom.FinalRuleConfig.ip:type_name -> xray.common.geodata.IPRule
-	4,  // 5: xray.proxy.freedom.FinalRuleConfig.delay:type_name -> xray.proxy.freedom.Range
-	11, // 6: xray.proxy.freedom.FinalRuleConfig.log_level:type_name -> xray.common.log.Severity
-	12, // 7: xray.proxy.freedom.Config.domain_strategy:type_name -> xray.transport.internet.DomainStrategy
-	1,  // 8: xray.proxy.freedom.Config.destination_override:type_name -> xray.proxy.freedom.DestinationOverride
-	2,  // 9: xray.proxy.freedom.Config.fragment:type_name -> xray.proxy.freedom.Fragment
-	3,  // 10: xray.proxy.freedom.Config.noises:type_name -> xray.proxy.freedom.Noise
-	5,  // 11: xray.proxy.freedom.Config.final_rules:type_name -> xray.proxy.freedom.FinalRuleConfig
-	12, // [12:12] is the sub-list for method output_type
-	12, // [12:12] is the sub-list for method input_type
-	12, // [12:12] is the sub-list for extension type_name
-	12, // [12:12] is the sub-list for extension extendee
-	0,  // [0:12] is the sub-list for field type_name
+	4,  // 5: xray.proxy.freedom.FinalRuleConfig.block_delay:type_name -> xray.proxy.freedom.Range
+	11, // 6: xray.proxy.freedom.Config.domain_strategy:type_name -> xray.transport.internet.DomainStrategy
+	1,  // 7: xray.proxy.freedom.Config.destination_override:type_name -> xray.proxy.freedom.DestinationOverride
+	2,  // 8: xray.proxy.freedom.Config.fragment:type_name -> xray.proxy.freedom.Fragment
+	3,  // 9: xray.proxy.freedom.Config.noises:type_name -> xray.proxy.freedom.Noise
+	5,  // 10: xray.proxy.freedom.Config.final_rules:type_name -> xray.proxy.freedom.FinalRuleConfig
+	11, // [11:11] is the sub-list for method output_type
+	11, // [11:11] is the sub-list for method input_type
+	11, // [11:11] is the sub-list for extension type_name
+	11, // [11:11] is the sub-list for extension extendee
+	0,  // [0:11] is the sub-list for field type_name
 }

 func init() { file_proxy_freedom_config_proto_init() }
@@ -638,7 +625,6 @@ func file_proxy_freedom_config_proto_init() {
 	if File_proxy_freedom_config_proto != nil {
 		return
 	}
-	file_proxy_freedom_config_proto_msgTypes[4].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
@@ -11,7 +11,6 @@ import "transport/internet/config.proto";
 import "common/net/port.proto";
 import "common/net/network.proto";
 import "common/geodata/geodat.proto";
-import "common/log/log.proto";

 message DestinationOverride {
  xray.common.protocol.ServerEndpoint server = 1;
@@ -52,8 +51,7 @@ message FinalRuleConfig {
  repeated xray.common.net.Network networks = 2;
  xray.common.net.PortList port_list = 3;
  repeated xray.common.geodata.IPRule ip = 4;
-  Range delay = 5;
-  optional xray.common.log.Severity log_level = 6;
+  Range block_delay = 5;
 }

 message Config {
@@ -15,7 +15,6 @@ import (
 	"github.com/xtls/xray-core/common/dice"
 	"github.com/xtls/xray-core/common/errors"
 	"github.com/xtls/xray-core/common/geodata"
-	"github.com/xtls/xray-core/common/log"
 	"github.com/xtls/xray-core/common/net"
 	"github.com/xtls/xray-core/common/platform"
 	"github.com/xtls/xray-core/common/retry"
@@ -73,26 +72,23 @@ func init() {
 	}

 	defaultBlockPrivateRule = &FinalRule{
-		action:   RuleAction_Block,
-		network:  allNetworks,
-		ip:       geodata.GetPrivateIPMatcher(),
-		logLevel: log.Severity_Warning.Enum(),
+		action:  RuleAction_Block,
+		network: allNetworks,
+		ip:      geodata.GetPrivateIPMatcher(),
 	}

 	defaultBlockAllRule = &FinalRule{
-		action:   RuleAction_Block,
-		network:  allNetworks,
-		logLevel: log.Severity_Warning.Enum(),
+		action:  RuleAction_Block,
+		network: allNetworks,
 	}
 }

 type FinalRule struct {
-	action   RuleAction
-	network  [8]bool
-	port     net.MemoryPortList
-	ip       geodata.IPMatcher
-	delay    *Range
-	logLevel *log.Severity
+	action     RuleAction
+	network    [8]bool
+	port       net.MemoryPortList
+	ip         geodata.IPMatcher
+	blockDelay *Range
 }

 // Handler handles Freedom connections.
@@ -106,9 +102,8 @@ type Handler struct {

 func buildFinalRule(config *FinalRuleConfig) (*FinalRule, error) {
 	rule := &FinalRule{
-		action:   config.GetAction(),
-		delay:    config.GetDelay(),
-		logLevel: config.LogLevel,
+		action:     config.GetAction(),
+		blockDelay: config.GetBlockDelay(),
 	}

 	if len(config.Networks) == 0 {
@@ -169,7 +164,7 @@ func getDefaultFinalRule(inbound *session.Inbound) *FinalRule {
 	switch inbound.Name {
 	case "vless-reverse":
 		return defaultBlockAllRule
-	case "vless", "vmess", "trojan", "hysteria", "wireguard", "masque":
+	case "vless", "vmess", "trojan", "hysteria", "wireguard":
 		return defaultBlockPrivateRule
 	default:
 		if strings.HasPrefix(inbound.Name, "shadowsocks") {
@@ -217,12 +212,12 @@ func (h *Handler) policy() policy.Session {
 	return p
 }

-func (r *FinalRule) blockDuration() time.Duration {
+func (h *Handler) blockDelay(rule *FinalRule) time.Duration {
 	min := uint64(30)
 	max := uint64(90)
-	if r.delay != nil {
-		min = r.delay.Min
-		max = r.delay.Max
+	if rule.blockDelay != nil {
+		min = rule.blockDelay.Min
+		max = rule.blockDelay.Max
 	}
 	span := max - min
 	if max < min {
@@ -231,26 +226,9 @@ func (r *FinalRule) blockDuration() time.Duration {
 	return time.Duration(min+uint64(dice.Roll(int(span+1)))) * time.Second
 }

-func (r *FinalRule) log(ctx context.Context, msg ...interface{}) {
-	level := log.Severity_Info
-	if r.logLevel != nil {
-		level = *r.logLevel
-	}
-	switch level {
-	case log.Severity_Debug:
-		errors.LogDebug(ctx, msg...)
-	case log.Severity_Info:
-		errors.LogInfo(ctx, msg...)
-	case log.Severity_Warning:
-		errors.LogWarning(ctx, msg...)
-	case log.Severity_Error:
-		errors.LogError(ctx, msg...)
-	}
-}
-
 func (h *Handler) blackhole(ctx context.Context, input buf.Reader, output buf.Writer, rule *FinalRule, dest *net.Destination) error {
-	delay := rule.blockDuration()
-	rule.log(ctx, "target blocked by a finalrule: ", *dest, ", blackholing connection for ", delay)
+	delay := h.blockDelay(rule)
+	errors.LogInfo(ctx, "blocked target: ", *dest, ", blackholing connection for ", delay)
 	defer common.Close(output)
 	done := make(chan struct{})
 	go func() { // a DispatchLink inbound's reader ignores Interrupt, so don't wait for this copy
@@ -262,7 +240,7 @@ func (h *Handler) blackhole(ctx context.Context, input buf.Reader, output buf.Wr
 	case <-time.After(delay):
 		common.Interrupt(input)
 		common.Interrupt(output)
-		rule.log(ctx, "closed blackholed connection to blocked target: ", *dest)
+		errors.LogInfo(ctx, "closed blackholed connection to blocked target: ", *dest)
 	}
 	return nil
 }
@@ -4,7 +4,7 @@ TUN interface support bridges the gap between network layer 3 and layer 7, intro

 This functionality is targeted to assist applications/end devices that don't have proxy support, or can't run external applications (like Smart TV's). Making it possible to run Xray proxy right on network edge devices (routers) with support to route raw network traffic. \
 Primary targets are Linux based router devices. Like most popular OpenWRT option. \
-Support for Windows, macOS, FreeBSD, Android and iOS is also implemented (see below).
+Support for Windows, macOS, Android and iOS is also implemented (see below).

 ## PLEASE READ FOLLOWING CAREFULLY

@@ -25,8 +25,6 @@ Examples of how to achieve this on a simple Linux system (Ubuntu with systemd-ne

 Packets are handled by Xray-core's own lightweight TCP/IP stack, which replaced gVisor (XTLS/Xray-core#7130).

-On Linux, as on Android, the TUN can also be a file descriptor handed over through the environment variable `xray.tun.fd` (or `XRAY_TUN_FD`), e.g. for lightweight or unprivileged setups.
-
 With `autoSystemRoutingTable`, Xray's own connections are kept out of the TUN through `autoOutboundsInterface` (then `"auto"` by default): each of their sockets is bound to another interface, the one named there, or with `"auto"` the one of the default route (Android needs the name). Linux and Android bind with `SO_BINDTODEVICE`, Windows with `IP_UNICAST_IF` and `IPV6_UNICAST_IF`, macOS and iOS with `IP_BOUND_IF` and `IPV6_BOUND_IF`, and FreeBSD switches them to another routing table (see [FreeBSD SUPPORT](#freebsd-support)). Connections to loopback addresses, TCP and UDP, stay unbound. If a socket cannot be bound, the connection fails rather than leave unbound, where it could loop back into the TUN (XTLS/Xray-core#7173).

 ### SYSTEM DNS ON LINUX AND FREEBSD (`autoSystemDnsToGateway`)
@@ -223,26 +221,23 @@ To make it start, wintun.dll specific for your Windows/arch must be present next

 After the start network adapter with the name you chose in the config will be created in the system, and exist while Xray is running. A Wintun adapter that already has that name is reused.

-With IPv6 disabled system-wide (the `DisabledComponents` registry value), the adapter has no IPv6, and the TUN starts with IPv4 only, unless `gateway`, `dns` or `autoSystemRoutingTable` has IPv6 entries, which then keep it from starting.
+With IPv6 disabled system-wide (the `DisabledComponents` registry value), the adapter has no IPv6, and the TUN starts with IPv4 only, unless `gateway` or `autoSystemRoutingTable` has IPv6 entries, which then keep it from starting.

-When `dns` is set, those servers are applied to the adapter. Windows is kept from registering the TUN's addresses in DNS, and its DNS cache is flushed when the TUN starts and stops. Xray's own lookups through the system's DNS servers, like those of the `localhost` DNS server with `autoOutboundsInterface`, skip them, unless another interface uses them as well, as they would lead back into the TUN.
+When `dns` is set, those servers are applied to the adapter. Windows is kept from registering the TUN's addresses in DNS, and its DNS cache is flushed when the TUN starts and stops.

-Setting `autoSystemWfpBlockLeak` to at least `["dns"]` is recommended, to block DNS leaks. It needs `autoSystemRoutingTable` (the config is rejected otherwise), and adds Windows Filtering Platform filters that let traffic of every program but Xray itself leave only through the TUN, each kind chosen by a value:
- `"dns"`: stands for `"53"`, `"853"` (DNS over TLS and QUIC) and `"windnsclient"`. Windows also queries the DNS servers of the other interfaces, through those interfaces whatever the routes say, and other programs reach a resolver on the local network (e.g. `192.168.1.1` from DHCP) through its more specific route.
- `"windnsclient"`: Windows' DNS Client service, except for name resolution on the local network (LLMNR, mDNS). Since Windows 11 and Server 2022, it may query over HTTPS or TLS, to any port; earlier versions only query port 53, so there it does nothing.
- `"tcp"`, `"udp"`: that protocol, to all ports, or with `/<port>` or `/<low>-<high>` (1 to 65535) to some, e.g. `"tcp/853"` or `"udp/10-20"`. The ports alone stand for both, e.g. `"53"` or `"10-20"`.
- `"icmp"`: ICMP and ICMPv6, e.g. `ping`.
- `"misconfigtun"`: an IP version without routes in `autoSystemRoutingTable`, which would bypass the TUN.
- `"all"`: everything, in both directions. Access to the local network then breaks unless it is routed into the TUN as well, and so do incoming connections to other programs, other VPNs, and virtual machines whose NAT runs on the host.
- `"allexceptlan"`: like `"all"`, but traffic to and from the local network stays allowed, e.g. for printers or casting to a TV: private, link-local, multicast and broadcast addresses (`10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`, `169.254.0.0/16`, `224.0.0.0/4`, `255.255.255.255`, `fc00::/7`, `fe80::/10`, `ff00::/8`), not global IPv6 ones. It includes `"dns"`, and the other values apply there as well. `"all"` overrides it.
+With `autoSystemWfpBlockLeak`, which needs `autoSystemRoutingTable` (the config is rejected otherwise), Xray also adds Windows Filtering Platform filters that keep traffic of every program but Xray itself from leaving outside the TUN, each kind chosen by a value in the list, e.g. `"autoSystemWfpBlockLeak": ["dns", "misconfigtun"]`:
+- `"tcp/<port>"`, `"udp/<port>"`: connections to that TCP or UDP port only go through the TUN, e.g. `"tcp/853"`.
+- `"windnsclient"`: Windows' DNS Client service cannot connect outside the TUN at all, except for name resolution on the local network (LLMNR, mDNS). On Windows 11 and Server 2022 and later, it may send name queries over HTTPS or TLS, to any port. Earlier versions only query port 53, so there it does nothing.
+- `"dns"`: stands for `"udp/53"`, `"tcp/53"`, `"windnsclient"`, `"tcp/853"` (DNS over TLS) and `"udp/853"` (DNS over QUIC). Windows keeps sending name queries to the DNS servers of the other interfaces as well, out through those interfaces whatever the routes say, and other programs reach a resolver on the local network (e.g. `192.168.1.1` handed out by DHCP) through its more specific LAN route instead of the TUN. Keeping the system's DNS inside the TUN like this, with `"dns"`, `"udp/53"`, `"tcp/53"` or `"windnsclient"`, needs `dns` (the config is rejected otherwise). The `dns` servers then have to lie within `gateway` or `autoSystemRoutingTable` (a warning is logged otherwise), and DNS servers that should be reached directly belong in Xray's own `dns` settings.
+- `"misconfigtun"`: an IP version without routes in `autoSystemRoutingTable`, IPv4 or IPv6, is blocked entirely, in both directions, as it would bypass the TUN. Only loopback and what Windows itself needs on the local link (DHCP, and for IPv6 neighbor and multicast listener discovery) remain allowed. An address of that version in `gateway` is not needed: without one, Windows gives the TUN link-local addresses itself, an IPv6 one at once and an IPv4 one from `169.254.0.0/16` after some seconds (until then, IPv4 routed to the TUN is unreachable), and what is routed to the TUN goes through it with those.

-A CIDR in front limits a value to its addresses, an IPv6 one in brackets, e.g. `"8.8.8.8/32:all"`, `"1.1.1.0/24:53"` or `"[::/0]:all"` (IPv6 only). It limits what the value stands for or includes as well: `"0.0.0.0/0:allexceptlan"`, for instance, leaves DNS over IPv6 open.
+With the filters in place, Xray's own connections out also get past Windows Firewall's block rules (other firewalls may still block them), while connections to Xray's inbounds stay subject to them.

-Loopback, DHCP, DHCPv6 and IPv6 neighbor discovery always stay allowed. Xray's own connections out also get past Windows Firewall's block rules, while connections to its inbounds stay subject to them. If the filters cannot be added, Xray does not start; they are removed when it exits. `"dns"` leaves name resolution on the local network (LLMNR, mDNS, NetBIOS) alone; `"all"` or `"udp"`, for instance, block it as well.
+Names that Xray resolves through the system resolver, such as an outbound's server address given as a domain with the default `AsIs` domain strategy, would be looked up by Windows on Xray's behalf, and those queries would then go into the TUN too. While DNS is restricted this way and `autoOutboundsInterface` is in use (the default with `autoSystemRoutingTable`), Xray therefore resolves them itself, with its own queries to the DNS servers of the other interfaces. That bypasses Windows' DNS cache, and its name resolution on the local network (LLMNR, mDNS): a server address given as a domain is looked up again for every connection, and a DNS server that does not answer delays each lookup. Having Xray's own `dns` resolve it, through the outbound's `sockopt.domainStrategy`, avoids that. The `localhost` DNS server queries the same servers whenever `autoOutboundsInterface` is in use. Both skip the TUN's own DNS servers, unless another interface uses them as well: queried from Xray itself, they would lead back into it, or nowhere.

-Keeping the system's DNS inside the TUN, with `"all"`, `"allexceptlan"`, `"dns"`, `"windnsclient"`, or anything covering TCP or UDP port 53, even to some addresses only, needs `dns` (the config is rejected otherwise), whose servers have to lie within `gateway` or `autoSystemRoutingTable`, or be loopback addresses like `127.0.0.1` (a warning is logged otherwise); DNS servers to be reached directly belong in Xray's own `dns` settings. With `autoOutboundsInterface`, names that Xray would look up through the system, e.g. an outbound's server address with the default `AsIs` domain strategy, are then resolved by Xray itself, from the DNS servers of the other interfaces, as Windows would send those queries into the TUN. That bypasses Windows' DNS cache, so such a name is looked up for every connection; resolving it with Xray's own `dns`, through the outbound's `sockopt.domainStrategy`, avoids that.
+If the filters cannot be added, Xray does not start. They are removed when Xray exits. Not covered is name resolution on the local network (LLMNR, mDNS, NetBIOS), except over an IP version that is blocked.

-`autoSystemWfpBlockLeak` is empty by default, as the filters break some setups: with `"dns"`, a local DNS resolver that queries through another interface, the DNS of another VPN, virtual machines whose NAT resolves names on the host, and captive portals; with `"misconfigtun"`, IPv4 or IPv6 on the local network while not routed into the TUN.
+`autoSystemWfpBlockLeak` (Windows only) is empty by default, as the filters break some setups: with `"dns"`, a local DNS resolver other programs use (e.g. on `127.0.0.1:53`), the DNS of another VPN on its own interface, virtual machines whose NAT resolves names on the host, or signing in to a captive portal; with `"misconfigtun"`, IPv4 or IPv6 on the local network while no route of that version leads to the TUN. Without the filters, DNS may leak as described above. To keep an IP version out of the TUN on purpose while still blocking DNS leaks, use only `["dns"]`.

 `autoOutboundsInterface` (the default with `autoSystemRoutingTable`) keeps Xray's own connections out of the TUN by binding them to another interface, which Windows only honors while that interface has weak host send and forwarding off for the IP versions routed to the TUN. Otherwise, Windows sends them into the TUN, from that interface's address, and they stall. While the TUN runs, Xray therefore turns weak host send off on that interface, and on again when it stops or another interface takes over. Forwarding cannot be turned off this way, as Mobile Hotspot and Internet Connection Sharing need it, so a warning is logged while it is on. Having the hotspot share the TUN instead of that interface (Settings, Mobile hotspot, Share my internet connection from) moves forwarding to the TUN, where it does no harm, and sends the hotspot's devices through Xray as well.

@@ -115,7 +115,6 @@ func (t *WindowsTun) Start() (err error) {
 	for _, ip := range t.options.DNS {
 		dns = append(dns, netip.MustParseAddr(ip))
 	}
-	dns6 := slices.ContainsFunc(dns, netip.Addr.Is6)

 	var route4, route6 bool
 	routesMap := make(map[winipcfg.RouteData]struct{})
@@ -176,7 +175,7 @@ startOver:
 		if err != nil {
 			// With IPv6 disabled system-wide (DisabledComponents), the adapter has no
 			// IPv6 interface at all. Skip the family unless the config asks for it.
-			if err == windows.ERROR_NOT_FOUND && family == windows.AF_INET6 && !address6 && !route6 && !dns6 {
+			if err == windows.ERROR_NOT_FOUND && family == windows.AF_INET6 && !address6 && !route6 {
 				continue
 			}
 			return err
@@ -202,12 +201,6 @@ startOver:
 		}
 		err = t.luid.SetDNS(family, dns, nil)
 		if err != nil {
-			// Skip IPv6 the config does not ask for also when setting its DNS
-			// servers fails, as reported on Windows 11 24H2 with IPv6 disabled
-			// (Access is denied).
-			if family == windows.AF_INET6 && !address6 && !route6 && !dns6 {
-				continue
-			}
 			firstErr = errors.New("unable to set DNS").Base(err)
 			if err == windows.ERROR_NOT_FOUND {
 				goto startOver
@@ -254,22 +247,18 @@ startOver:
 	}

 	// With autoSystemWfpBlockLeak, once the system routes lead to the TUN,
-	// keep the protocols and ports given ("dns" stands for those of DNS),
-	// Windows' DNS Client service, an IP version no route of which leads to
-	// the TUN ("misconfigtun"), or everything ("all", or "allexceptlan" but
-	// for the local network), to the addresses of a CIDR or to all, from
-	// leaving through the other interfaces. The TUN's own addresses do not
-	// matter: without one of a version in gateway, Windows gives it a
-	// link-local one.
+	// keep connections to the ports given ("dns" stands for those of DNS),
+	// Windows' DNS Client service, and an IP version no route of which leads
+	// to the TUN ("misconfigtun"), from leaving through the other interfaces.
+	// Addresses do not matter: without one of a version in gateway, Windows
+	// gives the TUN a link-local one.
 	leaks, err := ExpandWfpBlockLeak(t.options.AutoSystemWfpBlockLeak)
 	if err != nil {
 		return err
 	}
 	block := newLeakFilters(leaks, route4, route6)
 	if route4 || route6 {
-		dnsClient := func(l leak) bool { return l.name == "windnsclient" }
-		if slices.ContainsFunc(block, dnsClient) && !dnsClientUsesAnyPort() {
-			block = slices.DeleteFunc(block, dnsClient)
+		if slices.Contains(leaks, "windnsclient") && !block.dnsClient {
 			errors.LogInfo(context.Background(), "[tun] windnsclient skipped: before Windows 11 and Server 2022, the DNS Client service only queries port 53")
 		}
 		if block.systemDNS() && len(dns) == 0 {
@@ -282,17 +271,19 @@ startOver:
 			return errors.New("unable to block ", blocked, " outside the TUN (remove autoSystemWfpBlockLeak to run without)").Base(err)
 		}
 		errors.LogInfo(context.Background(), "[tun] blocked outside the TUN: ", blocked)
-		covered := slices.Clone(addresses)
-		for _, route := range routesData {
-			covered = append(covered, route.Destination)
-		}
-		for _, server := range dnsOutsideTUN(dns, covered, block) {
-			errors.LogWarning(context.Background(), "[tun] DNS server ", server, " is in neither gateway nor autoSystemRoutingTable, so queries to it cannot go through the TUN and are blocked")
-		}
-		// With updater, the dialer controllers bind Xray's own sockets to the
-		// physical interface.
-		if block.systemDNS() && updater != nil {
-			t.resolver = resolveOnOwn()
+		if block.systemDNS() {
+			covered := slices.Clone(addresses)
+			for _, route := range routesData {
+				covered = append(covered, route.Destination)
+			}
+			for _, server := range dnsOutsideTUN(dns, covered) {
+				errors.LogWarning(context.Background(), "[tun] DNS server ", server, " is in neither gateway nor autoSystemRoutingTable, so queries to it cannot go through the TUN and are blocked")
+			}
+			// With updater, the dialer controllers bind Xray's own sockets
+			// to the physical interface.
+			if updater != nil {
+				t.resolver = resolveOnOwn()
+			}
 		}
 	}
 	if len(dns) > 0 || route4 || route6 {
@@ -3,7 +3,6 @@
 package tun

 import (
-	"encoding/binary"
 	"net/netip"
 	"os"
 	"runtime"
@@ -38,19 +37,15 @@ const (
 	fwpmSessionFlagDynamic         = 1  // FWPM_SESSION_FLAG_DYNAMIC
 	fwpmFilterFlagClearActionRight = 8  // FWPM_FILTER_FLAG_CLEAR_ACTION_RIGHT

-	fwpUint8                  = 1     // FWP_UINT8
-	fwpUint16                 = 2     // FWP_UINT16
-	fwpUint32                 = 3     // FWP_UINT32
-	fwpUint64                 = 4     // FWP_UINT64
-	fwpByteArray16Type        = 11    // FWP_BYTE_ARRAY16_TYPE
-	fwpByteBlobType           = 12    // FWP_BYTE_BLOB_TYPE
-	fwpSecurityDescriptorType = 14    // FWP_SECURITY_DESCRIPTOR_TYPE
-	fwpV4AddrMask             = 0x100 // FWP_V4_ADDR_MASK
-	fwpV6AddrMask             = 0x101 // FWP_V6_ADDR_MASK
-	fwpRangeType              = 0x102 // FWP_RANGE_TYPE
+	fwpUint8                  = 1  // FWP_UINT8
+	fwpUint16                 = 2  // FWP_UINT16
+	fwpUint32                 = 3  // FWP_UINT32
+	fwpUint64                 = 4  // FWP_UINT64
+	fwpByteArray16Type        = 11 // FWP_BYTE_ARRAY16_TYPE
+	fwpByteBlobType           = 12 // FWP_BYTE_BLOB_TYPE
+	fwpSecurityDescriptorType = 14 // FWP_SECURITY_DESCRIPTOR_TYPE

 	fwpMatchEqual       = 0 // FWP_MATCH_EQUAL
-	fwpMatchRange       = 5 // FWP_MATCH_RANGE
 	fwpMatchFlagsAllSet = 6 // FWP_MATCH_FLAGS_ALL_SET

 	fwpConditionFlagIsLoopback = 1 // FWP_CONDITION_FLAG_IS_LOOPBACK
@@ -99,37 +94,6 @@ type fwpValue0 struct {
 	value uintptr
 }

-// fwpRange0 is FWP_RANGE0, which an FWP_RANGE_TYPE condition points to.
-type fwpRange0 struct {
-	low, high fwpValue0
-}
-
-// fwpV4AddrAndMask is FWP_V4_ADDR_AND_MASK, in host byte order.
-type fwpV4AddrAndMask struct {
-	addr, mask uint32
-}
-
-// fwpV6AddrAndMask is FWP_V6_ADDR_AND_MASK.
-type fwpV6AddrAndMask struct {
-	addr         [16]byte
-	prefixLength uint8
-}
-
-// lanPrefixes are what "allexceptlan" leaves to the local network: private
-// and link-local addresses, and multicast and broadcast, which discovery on
-// it uses.
-var lanPrefixes = []netip.Prefix{
-	netip.MustParsePrefix("10.0.0.0/8"),
-	netip.MustParsePrefix("172.16.0.0/12"),
-	netip.MustParsePrefix("192.168.0.0/16"),
-	netip.MustParsePrefix("169.254.0.0/16"),
-	netip.MustParsePrefix("224.0.0.0/4"),
-	netip.MustParsePrefix("255.255.255.255/32"),
-	netip.MustParsePrefix("fc00::/7"),
-	netip.MustParsePrefix("fe80::/10"),
-	netip.MustParsePrefix("ff00::/8"),
-}
-
 type fwpmDisplayData0 struct {
 	name        *uint16
 	description *uint16
@@ -207,36 +171,27 @@ func condition(field *windows.GUID, typ uint32, value uintptr) fwpmFilterConditi
 	}
 }

-// leakFilters are the values of autoSystemWfpBlockLeak that blockLeaks keeps
-// from leaving outside the TUN.
-type leakFilters []leak
+// leakFilters is what blockLeaks keeps from leaving outside the TUN.
+type leakFilters struct {
+	ports      []leakPort // connections to these ports
+	dnsClient  bool       // Windows' DNS Client service
+	ipv4, ipv6 bool       // an IP version altogether
+}

 // newLeakFilters turns expanded autoSystemWfpBlockLeak values into the filters
-// for a TUN that the routes of route4 (IPv4) and route6 (IPv6) lead to, which
-// leave "misconfigtun" over the IP versions without such routes only.
+// for a TUN that the routes of route4 (IPv4) and route6 (IPv6) lead to.
 func newLeakFilters(leaks []string, route4, route6 bool) leakFilters {
 	var block leakFilters
-	for _, value := range leaks {
-		l, ok := parseLeak(value)
-		if !ok {
-			continue
-		}
-		if l.name == "misconfigtun" {
-			unrouted4, unrouted6 := !route4, !route6
-			if l.prefix.IsValid() {
-				unrouted4, unrouted6 = unrouted4 && l.prefix.Addr().Is4(), unrouted6 && l.prefix.Addr().Is6()
+	for _, leak := range leaks {
+		switch leak {
+		case "windnsclient":
+			block.dnsClient = dnsClientUsesAnyPort()
+		case "misconfigtun":
+			block.ipv4, block.ipv6 = !route4, !route6
+		default:
+			if port, ok := parseLeakPort(leak); ok {
+				block.ports = append(block.ports, port)
 			}
-			switch {
-			case !unrouted4 && !unrouted6:
-				continue
-			case !l.prefix.IsValid() && !unrouted4:
-				l.prefix = allAddresses(true)
-			case !l.prefix.IsValid() && !unrouted6:
-				l.prefix = allAddresses(false)
-			}
-		}
-		if !slices.Contains(block, l) {
-			block = append(block, l)
 		}
 	}
 	return block
@@ -244,69 +199,24 @@ func newLeakFilters(leaks []string, route4, route6 bool) leakFilters {

 // String lists what block keeps inside the TUN, or is empty for nothing.
 func (block leakFilters) String() string {
-	values := make([]string, len(block))
-	for i, l := range block {
-		values[i] = l.String()
+	var blocked []string
+	for _, port := range block.ports {
+		blocked = append(blocked, port.String())
 	}
-	return strings.Join(values, ", ")
+	for _, b := range []struct {
+		on   bool
+		what string
+	}{{block.dnsClient, "windnsclient"}, {block.ipv4, "IPv4"}, {block.ipv6, "IPv6"}} {
+		if b.on {
+			blocked = append(blocked, b.what)
+		}
+	}
+	return strings.Join(blocked, ", ")
 }

-// systemDNS tells whether block keeps the system's DNS inside the TUN, to at
-// least some addresses: port 53, the DNS Client service, or everything ("all"),
-// though not everything but the local network ("allexceptlan"), where a
-// resolver like the router's may be.
+// systemDNS tells whether block keeps the system's DNS inside the TUN.
 func (block leakFilters) systemDNS() bool {
-	return slices.ContainsFunc(block, leak.blocksDNS)
-}
-
-// prefixes returns the CIDRs of the values of block named name over an IP
-// version.
-func (block leakFilters) prefixes(name string, ipv6 bool) []netip.Prefix {
-	var prefixes []netip.Prefix
-	for _, l := range block {
-		if prefix, ok := l.over(ipv6); ok && l.name == name {
-			prefixes = append(prefixes, prefix)
-		}
-	}
-	return prefixes
-}
-
-// over returns the CIDR of l over an IP version, all its addresses for l
-// without one, or false for l over the other IP version only.
-func (l leak) over(ipv6 bool) (netip.Prefix, bool) {
-	if !l.prefix.IsValid() {
-		return allAddresses(ipv6), true
-	}
-	return l.prefix, l.prefix.Addr().Is6() == ipv6
-}
-
-// allAddresses is the CIDR of all addresses of an IP version.
-func allAddresses(ipv6 bool) netip.Prefix {
-	if ipv6 {
-		return netip.PrefixFrom(netip.IPv6Unspecified(), 0)
-	}
-	return netip.PrefixFrom(netip.IPv4Unspecified(), 0)
-}
-
-// lanWithin returns the parts of lanPrefixes that lie in any of prefixes: two
-// prefixes either share no address, or one holds the other.
-func lanWithin(prefixes ...netip.Prefix) []netip.Prefix {
-	var parts []netip.Prefix
-	for _, lan := range lanPrefixes {
-		for _, prefix := range prefixes {
-			if !prefix.Overlaps(lan) {
-				continue
-			}
-			part := lan
-			if prefix.Bits() > lan.Bits() {
-				part = prefix
-			}
-			if !slices.Contains(parts, part) {
-				parts = append(parts, part)
-			}
-		}
-	}
-	return parts
+	return block.dnsClient || slices.ContainsFunc(block.ports, func(port leakPort) bool { return port.port == 53 })
 }

 // dnsClientUsesAnyPort tells whether Windows' DNS Client service may send its
@@ -319,49 +229,31 @@ func dnsClientUsesAnyPort() bool {
 	return build >= 20348
 }

-// The weights of the filters of blockLeaks, the heaviest matching one of which
-// decides.
-const (
-	weightAllExceptLAN uint8 = iota // block "allexceptlan"
-	weightLAN                       // permit its local network
-	weightDNSClient                 // block "windnsclient"
-	weightLocalLink                 // permit its mDNS and LLMNR on the local network
-	weightBlock                     // block the other values
-	weightPermit                    // permit what always stays allowed, and the TUN
-	weightXray                      // permit Xray
-)
-
 // blockLeaks keeps traffic from leaving through interfaces other than tun,
 // for every program but Xray itself, whose outbounds (DNS included) use the
-// other interfaces on purpose, as the values of block say, each to the
-// addresses of its CIDR, or to all:
+// other interfaces on purpose:
 //
-//   - Protocols and ports: connections of these, TCP or UDP to some or all
-//     ports, or ICMP, may only go through the TUN, those of DNS (53), DNS
-//     over TLS (TCP 853) and DNS over QUIC (UDP 853) with "dns". Windows
-//     sends a name query to the DNS servers of all interfaces, not only to
-//     those of the TUN: to the first server of each interface, then to all
-//     of them when no answer arrives within a second or two. It sends the
-//     queries for the servers of an interface out through that interface,
-//     whatever the routes say, and other programs reach an on-link resolver,
-//     like 192.168.1.1 from DHCP, through its LAN route, which is more
-//     specific than the TUN's default route.
-//   - "windnsclient": since Windows 11 and Server 2022, Windows may also send
-//     its queries over HTTPS or TLS, to any port, so its DNS Client service
-//     may not connect outside the TUN at all, except for name resolution on
-//     the local network (mDNS, LLMNR).
-//   - "all", and "misconfigtun" over an IP version no route of which leads to
-//     the TUN: nothing at all outside the TUN, in either direction. The TUN
-//     carries what is routed to it even without an address of that IP
-//     version in gateway: Windows gives it link-local ones itself, an IPv6
-//     one at once, an IPv4 one from 169.254.0.0/16 after some seconds (until
-//     then, IPv4 routed to the TUN is unreachable).
-//   - "allexceptlan": the same, but to and from the local network.
-//
-// The other values still apply to what "allexceptlan" and "windnsclient" leave
-// open on the local network. Whatever is blocked, loopback, which cannot leave
-// the system, and what Windows itself needs on the local link stay allowed:
-// DHCP, and for IPv6 neighbor and multicast listener discovery.
+//   - ports: connections to these TCP or UDP ports may only go through the
+//     TUN, those of DNS (53), DNS over TLS (TCP 853) and DNS over QUIC (UDP
+//     853) with "dns". Windows sends a name query to the DNS servers of all
+//     interfaces, not only to those of the TUN: to the first server of each
+//     interface, then to all of them when no answer arrives within a second or
+//     two. It sends the queries for the servers of an interface out through
+//     that interface, whatever the routes say, and other programs reach an
+//     on-link resolver, like 192.168.1.1 from DHCP, through its LAN route,
+//     which is more specific than the TUN's default route.
+//   - dnsClient: since Windows 11 and Server 2022, Windows may also send its
+//     queries over HTTPS or TLS, to any port, so its DNS Client service may not
+//     connect outside the TUN at all, except for name resolution on the local
+//     link (mDNS, LLMNR).
+//   - ipv4, ipv6: no IPv4, or no IPv6, at all, in either direction, for a TUN
+//     that no route of it leads to, except loopback and what Windows itself
+//     needs on the local link (DHCP, and for IPv6 neighbor and multicast
+//     listener discovery), none of which can leave it. The TUN carries what
+//     is routed to it even without an address of that IP version in gateway:
+//     Windows gives it link-local ones itself, an IPv6 one at once, an IPv4
+//     one from 169.254.0.0/16 after some seconds (until then, IPv4 routed to
+//     the TUN is unreachable).
 //
 // The filters live in a dynamic WFP session: closing the returned engine handle
 // with closeWFPEngine deletes them, and so does Windows when the process dies.
@@ -462,149 +354,33 @@ func addLeakFilters(engine windows.Handle, tun winipcfg.LUID, block leakFilters)
 	onTUN := func(field *windows.GUID) fwpmFilterCondition0 {
 		return condition(field, fwpUint64, uintptr(unsafe.Pointer(tunLUID)))
 	}
-	// remote matches the remote addresses in any of prefixes, all of one IP
-	// version: conditions on the same field match when any of them does. With
-	// all addresses among them, no condition is needed.
-	remote := func(prefixes ...netip.Prefix) []fwpmFilterCondition0 {
-		if slices.ContainsFunc(prefixes, func(prefix netip.Prefix) bool { return prefix.Bits() == 0 }) {
-			return nil
-		}
-		var conditions []fwpmFilterCondition0
-		for _, prefix := range prefixes {
-			var value uintptr
-			typ := uint32(fwpV4AddrMask)
-			if prefix.Addr().Is6() {
-				addr := &fwpV6AddrAndMask{addr: prefix.Addr().As16(), prefixLength: uint8(prefix.Bits())}
-				pinner.Pin(addr) // the condition only holds it as uintptr
-				value, typ = uintptr(unsafe.Pointer(addr)), fwpV6AddrMask
-			} else {
-				a := prefix.Addr().As4()
-				addr := &fwpV4AddrAndMask{addr: binary.BigEndian.Uint32(a[:]), mask: ^uint32(0) << (32 - prefix.Bits())}
-				pinner.Pin(addr) // the condition only holds it as uintptr
-				value = uintptr(unsafe.Pointer(addr))
-			}
-			conditions = append(conditions, condition(&fwpmConditionIPRemoteAddress, typ, value))
-		}
-		return conditions
-	}
-	// toPorts matches the ports of traffic, if not all of them.
-	toPorts := func(traffic leak) []fwpmFilterCondition0 {
-		switch {
-		case traffic.low == 0:
-			return nil
-		case traffic.low == traffic.high:
-			return []fwpmFilterCondition0{condition(&fwpmConditionIPRemotePort, fwpUint16, uintptr(traffic.low))}
-		}
-		ports := &fwpRange0{
-			low:  fwpValue0{typ: fwpUint16, value: uintptr(traffic.low)},
-			high: fwpValue0{typ: fwpUint16, value: uintptr(traffic.high)},
-		}
-		pinner.Pin(ports) // the condition only holds it as uintptr
-		return []fwpmFilterCondition0{{
-			fieldKey:       fwpmConditionIPRemotePort,
-			matchType:      fwpMatchRange,
-			conditionValue: fwpValue0{typ: fwpRangeType, value: uintptr(unsafe.Pointer(ports))},
-		}}
-	}
-
-	// What stays allowed whatever is blocked, in both directions: replies to
-	// a connection accepted from outside would leave through the physical
-	// link as well.
-	type permit struct {
-		name       string
-		conditions []fwpmFilterCondition0
-	}
-	loopback := permit{"loopback", []fwpmFilterCondition0{{
-		fieldKey:       fwpmConditionFlags,
-		matchType:      fwpMatchFlagsAllSet,
-		conditionValue: fwpValue0{typ: fwpUint32, value: fwpConditionFlagIsLoopback},
-	}}}
-	// DHCP keeps the addresses of the other interfaces, which Xray's own
-	// connections use.
-	dhcp := permit{"DHCP", []fwpmFilterCondition0{
-		condition(&fwpmConditionIPProtocol, fwpUint8, windows.IPPROTO_UDP),
-		condition(&fwpmConditionIPLocalPort, fwpUint16, 68),
-		condition(&fwpmConditionIPRemotePort, fwpUint16, 67),
-	}}
-	// Neighbor and multicast listener discovery, ICMPv6 130-137 and 143,
-	// whose type and code sit where the local and remote port are.
-	discovery := permit{"IPv6 neighbor and multicast listener discovery", []fwpmFilterCondition0{condition(&fwpmConditionIPProtocol, fwpUint8, windows.IPPROTO_ICMPV6)}}
-	for _, typ := range []uintptr{130, 131, 132, 133, 134, 135, 136, 137, 143} {
-		discovery.conditions = append(discovery.conditions, condition(&fwpmConditionIPLocalPort, fwpUint16, typ))
-	}
-	discovery.conditions = append(discovery.conditions, condition(&fwpmConditionIPRemotePort, fwpUint16, 0))
-	dhcpv6 := []fwpmFilterCondition0{
-		condition(&fwpmConditionIPProtocol, fwpUint8, windows.IPPROTO_UDP),
-		condition(&fwpmConditionIPLocalPort, fwpUint16, 546),
-		condition(&fwpmConditionIPRemotePort, fwpUint16, 547),
-	}
-	// The DHCPv6 client sends to the servers' multicast address, and they
-	// answer from their own.
-	dhcpv6Out := permit{"DHCPv6", slices.Concat(dhcpv6, []fwpmFilterCondition0{condition(&fwpmConditionIPRemoteAddress, fwpByteArray16Type, uintptr(unsafe.Pointer(&ipv6AllDHCPv6Servers)))})}
-	dhcpv6In := permit{"DHCPv6", dhcpv6}
-
 	for _, layer := range []struct {
 		key       *windows.GUID
 		selfFlags uint32
 		via       *windows.GUID // the interface that has to be the TUN as well
-		ipv6      bool
-		permits   []permit
 	}{
-		{&fwpmLayerALEAuthConnectV4, fwpmFilterFlagClearActionRight, &fwpmConditionIPNexthopInterface, false, []permit{loopback, dhcp}},
-		{&fwpmLayerALEAuthRecvAcceptV4, 0, &fwpmConditionIPArrivalInterface, false, []permit{loopback, dhcp}},
-		{&fwpmLayerALEAuthConnectV6, fwpmFilterFlagClearActionRight, &fwpmConditionIPNexthopInterface, true, []permit{loopback, discovery, dhcpv6Out}},
-		{&fwpmLayerALEAuthRecvAcceptV6, 0, &fwpmConditionIPArrivalInterface, true, []permit{loopback, discovery, dhcpv6In}},
+		{&fwpmLayerALEAuthConnectV4, fwpmFilterFlagClearActionRight, &fwpmConditionIPNexthopInterface},
+		{&fwpmLayerALEAuthRecvAcceptV4, 0, &fwpmConditionIPArrivalInterface},
+		{&fwpmLayerALEAuthConnectV6, fwpmFilterFlagClearActionRight, &fwpmConditionIPNexthopInterface},
+		{&fwpmLayerALEAuthRecvAcceptV6, 0, &fwpmConditionIPArrivalInterface},
 	} {
-		throughTUN := permit{"through the TUN", []fwpmFilterCondition0{onTUN(&fwpmConditionIPLocalInterface), onTUN(layer.via)}}
-		if err := add(layer.key, "permit Xray", layer.selfFlags, fwpActionPermit, weightXray, self); err != nil {
+		if err := add(layer.key, "permit Xray", layer.selfFlags, fwpActionPermit, 4, self); err != nil {
 			return err
 		}
-		for _, p := range append(layer.permits, throughTUN) {
-			if err := add(layer.key, "permit "+p.name, 0, fwpActionPermit, weightPermit, p.conditions...); err != nil {
+		for _, port := range block.ports {
+			protocol := uintptr(windows.IPPROTO_UDP)
+			if port.tcp {
+				protocol = windows.IPPROTO_TCP
+			}
+			toPort := []fwpmFilterCondition0{
+				condition(&fwpmConditionIPProtocol, fwpUint8, protocol),
+				condition(&fwpmConditionIPRemotePort, fwpUint16, uintptr(port.port)),
+			}
+			throughTUN := slices.Concat(toPort, []fwpmFilterCondition0{onTUN(&fwpmConditionIPLocalInterface), onTUN(layer.via)})
+			if err := add(layer.key, "permit "+port.String()+" through the TUN", 0, fwpActionPermit, 3, throughTUN...); err != nil {
 				return err
 			}
-		}
-		for _, l := range block {
-			prefix, ok := l.over(layer.ipv6)
-			if !ok {
-				continue // for the other IP version only
-			}
-			var protocols []uintptr
-			switch l.name {
-			case "tcp":
-				protocols = []uintptr{windows.IPPROTO_TCP}
-			case "udp":
-				protocols = []uintptr{windows.IPPROTO_UDP}
-			case "":
-				protocols = []uintptr{windows.IPPROTO_TCP, windows.IPPROTO_UDP}
-			case "icmp":
-				protocols = []uintptr{windows.IPPROTO_ICMP}
-				if layer.ipv6 {
-					protocols = []uintptr{windows.IPPROTO_ICMPV6}
-				}
-			case "all", "misconfigtun":
-				// every protocol
-			default:
-				continue // "allexceptlan" and "windnsclient" have filters of their own
-			}
-			var matches []fwpmFilterCondition0
-			for _, protocol := range protocols {
-				matches = append(matches, condition(&fwpmConditionIPProtocol, fwpUint8, protocol))
-			}
-			matches = slices.Concat(matches, toPorts(l), remote(prefix))
-			if err := add(layer.key, "block "+l.String(), 0, fwpActionBlock, weightBlock, matches...); err != nil {
-				return err
-			}
-		}
-		if allExceptLAN := block.prefixes("allexceptlan", layer.ipv6); len(allExceptLAN) > 0 {
-			// Lighter than the other values, which so still apply on the
-			// local network, DNS with "allexceptlan" among them.
-			if lan := lanWithin(allExceptLAN...); len(lan) > 0 {
-				if err := add(layer.key, "permit the local network", 0, fwpActionPermit, weightLAN, remote(lan...)...); err != nil {
-					return err
-				}
-			}
-			if err := add(layer.key, "block allexceptlan", 0, fwpActionBlock, weightAllExceptLAN, remote(allExceptLAN...)...); err != nil {
+			if err := add(layer.key, "block "+port.String(), 0, fwpActionBlock, 2, toPort...); err != nil {
 				return err
 			}
 		}
@@ -613,11 +389,12 @@ func addLeakFilters(engine windows.Handle, tun winipcfg.LUID, block leakFilters)
 	// Since Windows 11 and Server 2022, the DNS Client service may also send
 	// the queries for an interface's servers over HTTPS or TLS, out through
 	// that interface and to any port. So there it may only connect through
-	// the TUN, except for mDNS and LLMNR on the local network. Like Windows
+	// the TUN, except for mDNS and LLMNR, which stay on the local link (over
+	// an IP version only while it is not blocked altogether). Like Windows
 	// Firewall's rules for it, the filters recognize the service by its SID,
 	// which Windows puts in the token of its process: the security descriptor
 	// grants that SID the right to match (FWP_ACTRL_MATCH_FILTER, CC in SDDL).
-	if slices.ContainsFunc(block, func(l leak) bool { return l.name == "windnsclient" }) {
+	if block.dnsClient {
 		sd, err := windows.SecurityDescriptorFromString("O:SYG:SYD:(A;;CCRC;;;" + dnsClientSID + ")")
 		if err != nil {
 			return err
@@ -628,20 +405,85 @@ func addLeakFilters(engine windows.Handle, tun winipcfg.LUID, block leakFilters)
 		// Conditions on the same field match when any of them does.
 		mdnsLLMNR := []fwpmFilterCondition0{dnsClient, condition(&fwpmConditionIPRemotePort, fwpUint16, 5353), condition(&fwpmConditionIPRemotePort, fwpUint16, 5355)}
 		for _, layer := range []struct {
-			key  *windows.GUID
-			ipv6 bool
+			key       *windows.GUID
+			localLink bool
 		}{
-			{&fwpmLayerALEAuthConnectV4, false},
-			{&fwpmLayerALEAuthConnectV6, true},
+			{&fwpmLayerALEAuthConnectV4, !block.ipv4},
+			{&fwpmLayerALEAuthConnectV6, !block.ipv6},
 		} {
-			prefixes := block.prefixes("windnsclient", layer.ipv6)
-			if len(prefixes) == 0 {
-				continue
-			}
-			if err := add(layer.key, "permit the DNS Client service's mDNS and LLMNR", 0, fwpActionPermit, weightLocalLink, slices.Concat(mdnsLLMNR, remote(lanWithin(allAddresses(layer.ipv6))...))...); err != nil {
+			if err := add(layer.key, "permit the DNS Client service through the TUN", 0, fwpActionPermit, 3, dnsClient, onTUN(&fwpmConditionIPLocalInterface), onTUN(&fwpmConditionIPNexthopInterface)); err != nil {
 				return err
 			}
-			if err := add(layer.key, "block the DNS Client service", 0, fwpActionBlock, weightDNSClient, slices.Concat([]fwpmFilterCondition0{dnsClient}, remote(prefixes...))...); err != nil {
+			if layer.localLink {
+				if err := add(layer.key, "permit the DNS Client service's mDNS and LLMNR", 0, fwpActionPermit, 3, mdnsLLMNR...); err != nil {
+					return err
+				}
+			}
+			if err := add(layer.key, "block the DNS Client service", 0, fwpActionBlock, 2, dnsClient); err != nil {
+				return err
+			}
+		}
+	}
+
+	// Both directions: replies to a connection accepted from outside would
+	// leave through the physical link as well.
+	loopback := fwpmFilterCondition0{
+		fieldKey:       fwpmConditionFlags,
+		matchType:      fwpMatchFlagsAllSet,
+		conditionValue: fwpValue0{typ: fwpUint32, value: fwpConditionFlagIsLoopback},
+	}
+	if block.ipv4 {
+		// DHCP keeps the addresses of the other interfaces, which Xray's own
+		// connections use.
+		dhcp := []fwpmFilterCondition0{
+			condition(&fwpmConditionIPProtocol, fwpUint8, windows.IPPROTO_UDP),
+			condition(&fwpmConditionIPLocalPort, fwpUint16, 68),
+			condition(&fwpmConditionIPRemotePort, fwpUint16, 67),
+		}
+		for _, layer := range []*windows.GUID{&fwpmLayerALEAuthConnectV4, &fwpmLayerALEAuthRecvAcceptV4} {
+			if err := add(layer, "permit IPv4 loopback", 0, fwpActionPermit, 1, loopback); err != nil {
+				return err
+			}
+			if err := add(layer, "permit DHCP", 0, fwpActionPermit, 1, dhcp...); err != nil {
+				return err
+			}
+			if err := add(layer, "block IPv4", 0, fwpActionBlock, 0); err != nil {
+				return err
+			}
+		}
+	}
+	if block.ipv6 {
+		// Neighbor and multicast listener discovery, ICMPv6 130-137 and 143,
+		// whose type and code sit where the local and remote port are.
+		discovery := []fwpmFilterCondition0{condition(&fwpmConditionIPProtocol, fwpUint8, windows.IPPROTO_ICMPV6)}
+		for _, typ := range []uintptr{130, 131, 132, 133, 134, 135, 136, 137, 143} {
+			discovery = append(discovery, condition(&fwpmConditionIPLocalPort, fwpUint16, typ))
+		}
+		discovery = append(discovery, condition(&fwpmConditionIPRemotePort, fwpUint16, 0))
+		dhcpv6 := []fwpmFilterCondition0{
+			condition(&fwpmConditionIPProtocol, fwpUint8, windows.IPPROTO_UDP),
+			condition(&fwpmConditionIPLocalPort, fwpUint16, 546),
+			condition(&fwpmConditionIPRemotePort, fwpUint16, 547),
+		}
+		for _, direction := range []struct {
+			layer  *windows.GUID
+			dhcpv6 []fwpmFilterCondition0
+		}{
+			// The client sends to the servers' multicast address, and they
+			// answer from their own.
+			{&fwpmLayerALEAuthConnectV6, slices.Concat(dhcpv6, []fwpmFilterCondition0{condition(&fwpmConditionIPRemoteAddress, fwpByteArray16Type, uintptr(unsafe.Pointer(&ipv6AllDHCPv6Servers)))})},
+			{&fwpmLayerALEAuthRecvAcceptV6, dhcpv6},
+		} {
+			if err := add(direction.layer, "permit IPv6 loopback", 0, fwpActionPermit, 1, loopback); err != nil {
+				return err
+			}
+			if err := add(direction.layer, "permit IPv6 neighbor and multicast listener discovery", 0, fwpActionPermit, 1, discovery...); err != nil {
+				return err
+			}
+			if err := add(direction.layer, "permit DHCPv6", 0, fwpActionPermit, 1, direction.dhcpv6...); err != nil {
+				return err
+			}
+			if err := add(direction.layer, "block IPv6", 0, fwpActionBlock, 0); err != nil {
 				return err
 			}
 		}
@@ -668,22 +510,13 @@ func addFilter(engine windows.Handle, sublayer, layer *windows.GUID, name string
 	return nil
 }

-// dnsOutsideTUN returns the servers whose queries block blocks: those outside
-// all of prefixes, the TUN's own subnets and routes, as queries to them cannot
-// go through the TUN, and inside the CIDR of a value that keeps DNS inside the
-// TUN, or of "misconfigtun". Loopback ones, local resolvers, are not among
-// them, as loopback stays allowed.
-func dnsOutsideTUN(servers []netip.Addr, prefixes []netip.Prefix, block leakFilters) []netip.Addr {
+// dnsOutsideTUN returns the servers outside all of prefixes, the TUN's own
+// subnets and routes: queries to them cannot go through the TUN.
+func dnsOutsideTUN(servers []netip.Addr, prefixes []netip.Prefix) []netip.Addr {
 	var outside []netip.Addr
 	for _, server := range servers {
 		server = server.Unmap()
-		if server.IsLoopback() || slices.ContainsFunc(prefixes, func(p netip.Prefix) bool { return p.Contains(server) }) {
-			continue
-		}
-		if slices.ContainsFunc(block, func(l leak) bool {
-			prefix, ok := l.over(server.Is6())
-			return ok && prefix.Contains(server) && (l.blocksDNS() || l.name == "misconfigtun")
-		}) {
+		if !slices.ContainsFunc(prefixes, func(p netip.Prefix) bool { return p.Contains(server) }) {
 			outside = append(outside, server)
 		}
 	}
@@ -40,21 +40,6 @@ func TestWFPStructLayout(t *testing.T) {
 		[]uintptr{unsafe.Sizeof(value), unsafe.Offsetof(value.value)},
 		[]uintptr{16, 8}, []uintptr{8, 4})

-	var ports fwpRange0
-	check("FWP_RANGE0",
-		[]uintptr{unsafe.Sizeof(ports), unsafe.Offsetof(ports.high)},
-		[]uintptr{32, 16}, []uintptr{16, 8})
-
-	var v4 fwpV4AddrAndMask
-	check("FWP_V4_ADDR_AND_MASK",
-		[]uintptr{unsafe.Sizeof(v4), unsafe.Offsetof(v4.mask)},
-		[]uintptr{8, 4}, []uintptr{8, 4})
-
-	var v6 fwpV6AddrAndMask
-	check("FWP_V6_ADDR_AND_MASK",
-		[]uintptr{unsafe.Sizeof(v6), unsafe.Offsetof(v6.prefixLength)},
-		[]uintptr{17, 16}, []uintptr{17, 16})
-
 	var display fwpmDisplayData0
 	check("FWPM_DISPLAY_DATA0",
 		[]uintptr{unsafe.Sizeof(display), unsafe.Offsetof(display.description)},
@@ -129,101 +114,35 @@ func TestLeakFiltersAccepted(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	// Each with a sublayer of its own.
-	for _, c := range []struct {
-		values         []string
-		route4, route6 bool
-	}{
-		{[]string{"dns", "misconfigtun", "all", "tcp/443", "udp/1000-2000", "tcp", "icmp", "10-20", "1-65535"}, false, false},
-		// CIDRs, and the local network's addresses.
-		{[]string{"1.1.1.0/24:tcp/80", "[2001:db8::/32]:udp/5000-6000", "[::/0]:icmp", "8.8.8.8/32:all", "[2000::/3]:misconfigtun", "9.9.9.9/32:dns"}, true, false},
-		{[]string{"allexceptlan", "udp/1000-2000", "icmp", "192.168.1.5/32:all"}, true, false},
-		{[]string{"0.0.0.0/0:allexceptlan", "[::/0]:all", "[::/0]:windnsclient", "1.0.0.0/8:windnsclient"}, true, true},
-		{[]string{"[::/0]:allexceptlan", "0.0.0.0/0:misconfigtun", "10.0.0.0/8:allexceptlan", "1.0.0.0/8:allexceptlan"}, false, true},
-	} {
-		leaks, err := ExpandWfpBlockLeak(c.values)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := addLeakFilters(engine, loopback, newLeakFilters(leaks, c.route4, c.route6)); err != nil {
-			skipUnlessElevated(err)
-		}
+	leaks, err := ExpandWfpBlockLeak([]string{"dns", "misconfigtun", "tcp/443"})
+	if err != nil {
+		t.Fatal(err)
+	}
+	block := newLeakFilters(leaks, false, false)
+	block.dnsClient = true // whatever the Windows version
+	if err := addLeakFilters(engine, loopback, block); err != nil {
+		skipUnlessElevated(err)
 	}
 }

 func TestNewLeakFilters(t *testing.T) {
-	for _, c := range []struct {
-		values         []string
-		route4, route6 bool
-		blocked        string
-		systemDNS      bool
-	}{
-		{[]string{"dns", "misconfigtun"}, true, false, "53, 853, windnsclient, [::/0]:misconfigtun", true},
-		{[]string{"tcp/853", "udp/853", "misconfigtun"}, true, true, "tcp/853, udp/853", false},
-		{[]string{"all"}, true, true, "all", true},
-		{[]string{"all", "misconfigtun"}, true, true, "all", true},
-		{[]string{"misconfigtun"}, true, false, "[::/0]:misconfigtun", false},
-		{[]string{"misconfigtun"}, false, true, "0.0.0.0/0:misconfigtun", false},
-		{[]string{"misconfigtun"}, false, false, "misconfigtun", false},
-		{[]string{"tcp/10-20", "udp", "icmp"}, true, true, "tcp/10-20, udp, icmp", true},
-		{[]string{"tcp/54-60", "icmp", "54-60"}, true, true, "tcp/54-60, icmp, 54-60", false},
-		{[]string{"allexceptlan"}, true, true, "allexceptlan, 53, 853, windnsclient", true},
-		{[]string{"allexceptlan", "all"}, true, true, "allexceptlan, 53, 853, windnsclient, all", true},
-		{[]string{"misconfigtun", "allexceptlan"}, true, false, "[::/0]:misconfigtun, allexceptlan, 53, 853, windnsclient", true},
-		// Limited to the addresses of a CIDR.
-		{[]string{"0.0.0.0/0:TCP/10-20", "[::/0]:udp", "0.0.0.0/0:icmp"}, true, true, "0.0.0.0/0:tcp/10-20, [::/0]:udp, 0.0.0.0/0:icmp", true},
-		{[]string{"[::/0]:tcp/54-60", "[::/0]:icmp"}, true, true, "[::/0]:tcp/54-60, [::/0]:icmp", false},
-		{[]string{"0.0.0.0/0:windnsclient"}, true, true, "0.0.0.0/0:windnsclient", true},
-		{[]string{"1.1.1.0/24:53"}, true, true, "1.1.1.0/24:53", true},
-		{[]string{"[::/0]:all"}, true, false, "[::/0]:all", true},
-		{[]string{"0.0.0.0/0:allexceptlan", "[::/0]:all"}, true, true, "0.0.0.0/0:allexceptlan, 0.0.0.0/0:53, 0.0.0.0/0:853, 0.0.0.0/0:windnsclient, [::/0]:all", true},
-		{[]string{"0.0.0.0/0:misconfigtun"}, true, false, "", false},
-		{[]string{"[::/0]:misconfigtun"}, true, false, "[::/0]:misconfigtun", false},
-		{[]string{"[2000::/3]:misconfigtun", "1.0.0.0/8:misconfigtun"}, true, false, "[2000::/3]:misconfigtun", false},
-		{[]string{"misconfigtun", "[::/0]:misconfigtun"}, true, false, "[::/0]:misconfigtun", false},
-		{[]string{"0.0.0.0/0:misconfigtun", "[::/0]:allexceptlan"}, false, true, "0.0.0.0/0:misconfigtun, [::/0]:allexceptlan, [::/0]:53, [::/0]:853, [::/0]:windnsclient", true},
-	} {
-		leaks, err := ExpandWfpBlockLeak(c.values)
-		if err != nil {
-			t.Fatal(err)
-		}
-		block := newLeakFilters(leaks, c.route4, c.route6)
-		if got := block.String(); got != c.blocked {
-			t.Errorf("%v: String() = %q, want %q", c.values, got, c.blocked)
-		}
-		if got := block.systemDNS(); got != c.systemDNS {
-			t.Errorf("%v: systemDNS() = %v", c.values, got)
-		}
+	leaks, err := ExpandWfpBlockLeak([]string{"dns", "misconfigtun"})
+	if err != nil {
+		t.Fatal(err)
 	}
-	// Without the port 53 values "allexceptlan" brings along, a resolver on
-	// the local network, like the router's, stays reachable.
-	if (leakFilters{{name: "allexceptlan"}}).systemDNS() {
-		t.Error("systemDNS() = true with the local network open")
+	block := newLeakFilters(leaks, true, false)
+	want := "udp/53, tcp/53, tcp/853, udp/853, IPv6"
+	if dnsClientUsesAnyPort() {
+		want = "udp/53, tcp/53, tcp/853, udp/853, windnsclient, IPv6"
 	}
-}
-
-func TestLanWithin(t *testing.T) {
-	prefixes := func(cidrs ...string) []netip.Prefix {
-		var prefixes []netip.Prefix
-		for _, cidr := range cidrs {
-			prefixes = append(prefixes, netip.MustParsePrefix(cidr))
-		}
-		return prefixes
+	if got := block.String(); got != want {
+		t.Errorf("String() = %q, want %q", got, want)
 	}
-	for _, c := range []struct {
-		within, lan []netip.Prefix
-	}{
-		{nil, nil},
-		{prefixes("0.0.0.0/0"), prefixes("10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "169.254.0.0/16", "224.0.0.0/4", "255.255.255.255/32")},
-		{prefixes("::/0"), prefixes("fc00::/7", "fe80::/10", "ff00::/8")},
-		{prefixes("1.0.0.0/8", "10.1.0.0/16"), prefixes("10.1.0.0/16")},
-		{prefixes("192.0.0.0/2"), prefixes("192.168.0.0/16", "224.0.0.0/4", "255.255.255.255/32")},
-		{prefixes("2000::/3", "fe80::/64", "fe80::/10"), prefixes("fe80::/64", "fe80::/10")},
-		{prefixes("8.8.8.8/32", "2001:db8::/32"), nil},
-	} {
-		if got := lanWithin(c.within...); !slices.Equal(got, c.lan) {
-			t.Errorf("%v: got %v, want %v", c.within, got, c.lan)
-		}
+	if !block.systemDNS() {
+		t.Error("systemDNS() = false with dns")
+	}
+	if block := newLeakFilters([]string{"tcp/853", "udp/853", "misconfigtun"}, true, true); block.String() != "tcp/853, udp/853" || block.systemDNS() {
+		t.Errorf("tcp/853, udp/853: %q, systemDNS() = %v", block.String(), block.systemDNS())
 	}
 }

@@ -248,38 +167,10 @@ func TestDNSOutsideTUN(t *testing.T) {
 		netip.MustParseAddr("::ffff:203.0.113.54"),
 		netip.MustParseAddr("8.8.8.8"),
 		netip.MustParseAddr("2001:db8::53"),
-		// Local resolvers, reachable over loopback whatever is blocked.
-		netip.MustParseAddr("127.0.0.1"),
-		netip.MustParseAddr("::ffff:127.0.0.53"),
-		netip.MustParseAddr("::1"),
 	}
-	// Only to the addresses of their CIDRs, if any, and "misconfigtun" over
-	// an IP version without routes to the TUN blocks DNS as well.
-	for _, c := range []struct {
-		values         []string
-		route4, route6 bool
-		want           []string
-	}{
-		{[]string{"dns"}, true, true, []string{"8.8.8.8", "2001:db8::53"}},
-		{[]string{"0.0.0.0/0:53"}, true, true, []string{"8.8.8.8"}},
-		{[]string{"8.8.8.0/24:windnsclient", "[2001:db8::/32]:tcp/853"}, true, true, []string{"8.8.8.8"}},
-		{[]string{"[2001:db8::53/128]:all", "9.9.9.9/32:53"}, true, true, []string{"2001:db8::53"}},
-		{[]string{"misconfigtun"}, true, false, []string{"2001:db8::53"}},
-		{[]string{"misconfigtun"}, true, true, nil},
-		{[]string{"tcp/853", "udp/5353", "icmp", "10.0.0.0/8:all"}, true, true, nil},
-		{[]string{"[::/0]:allexceptlan"}, true, true, []string{"2001:db8::53"}},
-	} {
-		leaks, err := ExpandWfpBlockLeak(c.values)
-		if err != nil {
-			t.Fatal(err)
-		}
-		var want []netip.Addr
-		for _, server := range c.want {
-			want = append(want, netip.MustParseAddr(server))
-		}
-		if got := dnsOutsideTUN(servers, prefixes, newLeakFilters(leaks, c.route4, c.route6)); !slices.Equal(got, want) {
-			t.Errorf("%v: got %v, want %v", c.values, got, want)
-		}
+	want := []netip.Addr{netip.MustParseAddr("8.8.8.8"), netip.MustParseAddr("2001:db8::53")}
+	if got := dnsOutsideTUN(servers, prefixes); !slices.Equal(got, want) {
+		t.Errorf("got %v, want %v", got, want)
 	}
 }

@@ -1,7 +1,6 @@
 package tun

 import (
-	"net/netip"
 	"slices"
 	"strconv"
 	"strings"
@@ -9,152 +8,72 @@ import (
 	"github.com/xtls/xray-core/common/errors"
 )

-// dnsLeaks is what "dns" in autoSystemWfpBlockLeak stands for: DNS over TCP
-// and UDP, DNS over TLS and QUIC, and Windows' DNS Client service, which may
-// also use other protocols and ports.
-var dnsLeaks = []string{"53", "853", "windnsclient"}
+// dnsLeaks is what "dns" in autoSystemWfpBlockLeak stands for: DNS over UDP and
+// TCP, Windows' DNS Client service, which may also use other protocols and
+// ports, DNS over TLS, and DNS over QUIC.
+var dnsLeaks = []string{"udp/53", "tcp/53", "windnsclient", "tcp/853", "udp/853"}

-// leak is a value of autoSystemWfpBlockLeak: "dns", "windnsclient",
-// "misconfigtun", "all", "allexceptlan", "icmp", or "tcp" or "udp", the latter
-// two with "/<port>" or "/<low>-<high>" for some ports only, such as "tcp/853"
-// or "udp/10-20", or such ports alone for TCP and UDP, such as "53". A CIDR in
-// front limits any of them to its addresses, an IPv6 one in brackets, such as
-// "1.1.1.0/24:53" or "[::/0]:all".
-type leak struct {
-	prefix    netip.Prefix // all addresses of both IP versions if not valid
-	name      string       // empty for TCP and UDP to some ports
-	low, high uint16       // the ports of TCP and UDP, both 0 for all
+// leakPort is a "tcp/<port>" or "udp/<port>" value of autoSystemWfpBlockLeak:
+// connections to that port may only go through the TUN.
+type leakPort struct {
+	tcp  bool
+	port uint16
 }

-func (l leak) String() string {
-	s := l.name
-	if l.low != 0 {
-		if s != "" {
-			s += "/"
-		}
-		s += strconv.Itoa(int(l.low))
-		if l.high != l.low {
-			s += "-" + strconv.Itoa(int(l.high))
-		}
-	}
-	switch {
-	case !l.prefix.IsValid():
-		return s
-	case l.prefix.Addr().Is6():
-		return "[" + l.prefix.String() + "]:" + s
-	default:
-		return l.prefix.String() + ":" + s
+func (p leakPort) String() string {
+	if p.tcp {
+		return "tcp/" + strconv.Itoa(int(p.port))
 	}
+	return "udp/" + strconv.Itoa(int(p.port))
 }

-// covers tells whether l includes connections of protocol, "tcp" or "udp", to
-// port, to at least some addresses.
-func (l leak) covers(protocol string, port uint16) bool {
-	switch l.name {
-	case "all":
-		return true
-	case "", protocol:
-		return l.low == 0 || l.low <= port && port <= l.high
+// parseLeakPort parses a lower case "tcp/<port>" or "udp/<port>" value.
+func parseLeakPort(value string) (leakPort, bool) {
+	protocol, port, ok := strings.Cut(value, "/")
+	if !ok || protocol != "tcp" && protocol != "udp" {
+		return leakPort{}, false
 	}
-	return false
-}
-
-// blocksDNS tells whether l keeps the system's DNS, TCP or UDP port 53 or
-// Windows' DNS Client service, inside the TUN, to at least some addresses.
-func (l leak) blocksDNS() bool {
-	return l.name == "windnsclient" || l.covers("udp", 53) || l.covers("tcp", 53)
-}
-
-// parseLeak parses a lower case value of autoSystemWfpBlockLeak. Ports go from
-// 1 to 65535, low not above high, and "tcp/1-65535" stands for all of them, as
-// does "tcp".
-func parseLeak(value string) (leak, bool) {
-	var l leak
-	cidr, rest, hasCIDR := strings.Cut(value, ":")
-	ipv6 := strings.HasPrefix(value, "[")
-	if ipv6 {
-		cidr, rest, hasCIDR = strings.Cut(value[1:], "]:")
+	n, err := strconv.ParseUint(port, 10, 16)
+	if err != nil || n == 0 {
+		return leakPort{}, false
 	}
-	if hasCIDR {
-		// IPv4-mapped IPv6 ones would not match: Windows checks such
-		// connections as IPv4.
-		prefix, err := netip.ParsePrefix(cidr)
-		if err != nil || prefix.Addr().Is6() != ipv6 || prefix.Addr().Is4In6() {
-			return leak{}, false
-		}
-		l.prefix, value = prefix.Masked(), rest
-	}
-	name, ports, hasPorts := strings.Cut(value, "/")
-	switch name {
-	case "tcp", "udp":
-		l.name = name
-		if !hasPorts {
-			return l, true
-		}
-	case "dns", "windnsclient", "misconfigtun", "all", "allexceptlan", "icmp":
-		l.name = name
-		return l, !hasPorts
-	default:
-		if hasPorts {
-			return leak{}, false
-		}
-		ports = name // for TCP and UDP
-	}
-	lowText, highText, isRange := strings.Cut(ports, "-")
-	low, err := strconv.ParseUint(lowText, 10, 16)
-	if err != nil || low == 0 {
-		return leak{}, false
-	}
-	high := low
-	if isRange {
-		if high, err = strconv.ParseUint(highText, 10, 16); err != nil || high < low {
-			return leak{}, false
-		}
-	}
-	if l.name == "" || low != 1 || high != 65535 {
-		l.low, l.high = uint16(low), uint16(high)
-	}
-	return l, true
+	return leakPort{tcp: protocol == "tcp", port: uint16(n)}, true
 }

 // ExpandWfpBlockLeak checks the values of autoSystemWfpBlockLeak and returns
-// them in lower case, in order and each once, with "dns" replaced by what it
-// stands for, "allexceptlan" followed by that, CIDRs masked, and ports written
-// the same way, "tcp/1-65535" as "tcp" say.
+// them in lower case, in order and without duplicates, with "dns" replaced by
+// what it stands for.
 func ExpandWfpBlockLeak(values []string) ([]string, error) {
-	var expanded []string
-	add := func(l leak) {
-		if value := l.String(); !slices.Contains(expanded, value) {
-			expanded = append(expanded, value)
+	var leaks []string
+	add := func(leak string) {
+		if !slices.Contains(leaks, leak) {
+			leaks = append(leaks, leak)
 		}
 	}
 	for _, value := range values {
-		l, ok := parseLeak(strings.ToLower(value))
-		if !ok {
-			return nil, errors.New("unknown autoSystemWfpBlockLeak value: ", value)
-		}
-		if l.name != "dns" {
-			add(l)
-		}
-		// The local network is no way out for DNS with "allexceptlan", as a
-		// resolver there, like the router, would forward outside the TUN.
-		if l.name == "dns" || l.name == "allexceptlan" {
-			for _, dnsLeak := range dnsLeaks {
-				dns, _ := parseLeak(dnsLeak)
-				dns.prefix = l.prefix
-				add(dns)
+		switch value = strings.ToLower(value); value {
+		case "dns":
+			for _, leak := range dnsLeaks {
+				add(leak)
 			}
+		case "windnsclient", "misconfigtun":
+			add(value)
+		default:
+			port, ok := parseLeakPort(value)
+			if !ok {
+				return nil, errors.New("unknown autoSystemWfpBlockLeak value: ", value)
+			}
+			add(port.String())
 		}
 	}
-	return expanded, nil
+	return leaks, nil
 }

 // BlocksSystemDNS tells whether expanded autoSystemWfpBlockLeak values keep the
-// system's DNS (TCP or UDP port 53, or Windows' DNS Client service) inside the
-// TUN, to at least some addresses, which then needs DNS servers of its own.
+// system's DNS (port 53, or Windows' DNS Client service) inside the TUN, which
+// then needs DNS servers of its own.
 func BlocksSystemDNS(leaks []string) bool {
-	return slices.ContainsFunc(leaks, func(value string) bool {
-		l, _ := parseLeak(value)
-		return l.blocksDNS()
+	return slices.ContainsFunc(leaks, func(leak string) bool {
+		return leak == "udp/53" || leak == "tcp/53" || leak == "windnsclient"
 	})
 }
@@ -12,39 +12,13 @@ func TestExpandWfpBlockLeak(t *testing.T) {
 		systemDNS bool
 	}{
 		{nil, nil, false},
-		{[]string{"dns"}, []string{"53", "853", "windnsclient"}, true},
-		{[]string{"DNS", "MisconfigTUN"}, []string{"53", "853", "windnsclient", "misconfigtun"}, true},
-		{[]string{"tcp/853", "dns", "TCP/0853"}, []string{"tcp/853", "53", "853", "windnsclient"}, true},
+		{[]string{"dns"}, []string{"udp/53", "tcp/53", "windnsclient", "tcp/853", "udp/853"}, true},
+		{[]string{"DNS", "MisconfigTUN"}, []string{"udp/53", "tcp/53", "windnsclient", "tcp/853", "udp/853", "misconfigtun"}, true},
+		{[]string{"tcp/853", "dns", "TCP/0853"}, []string{"tcp/853", "udp/53", "tcp/53", "windnsclient", "udp/853"}, true},
 		{[]string{"tcp/853", "udp/853", "misconfigtun"}, []string{"tcp/853", "udp/853", "misconfigtun"}, false},
 		{[]string{"udp/65535", "tcp/1"}, []string{"udp/65535", "tcp/1"}, false},
 		{[]string{"tcp/53"}, []string{"tcp/53"}, true},
 		{[]string{"windnsclient"}, []string{"windnsclient"}, true},
-		{[]string{"ALL"}, []string{"all"}, true},
-		{[]string{"tcp", "TCP", "UDP"}, []string{"tcp", "udp"}, true},
-		{[]string{"tcp/1-65535", "udp/1-65535"}, []string{"tcp", "udp"}, true},
-		{[]string{"udp/10-20", "udp/53-53", "tcp/50-60"}, []string{"udp/10-20", "udp/53", "tcp/50-60"}, true},
-		{[]string{"tcp/54-60", "udp/1-52"}, []string{"tcp/54-60", "udp/1-52"}, false},
-		{[]string{"ICMP", "icmp"}, []string{"icmp"}, false},
-		{[]string{"AllExceptLAN"}, []string{"allexceptlan", "53", "853", "windnsclient"}, true},
-		{[]string{"dns", "allexceptlan", "all"}, []string{"53", "853", "windnsclient", "allexceptlan", "all"}, true},
-		// Ports alone, for TCP and UDP.
-		{[]string{"53"}, []string{"53"}, true},
-		{[]string{"10-20", "0053", "853-853", "53"}, []string{"10-20", "53", "853"}, true},
-		{[]string{"54-60", "1-52", "65535"}, []string{"54-60", "1-52", "65535"}, false},
-		{[]string{"1-65535"}, []string{"1-65535"}, true},
-		{[]string{"853", "tcp/853"}, []string{"853", "tcp/853"}, false},
-		// Limited to the addresses of a CIDR.
-		{[]string{"1.1.1.0/24:53"}, []string{"1.1.1.0/24:53"}, true},
-		{[]string{"1.1.1.1/24:TCP/853", "[2001:DB8::1/32]:udp/10-20", "[::/0]:ICMP"}, []string{"1.1.1.0/24:tcp/853", "[2001:db8::/32]:udp/10-20", "[::/0]:icmp"}, false},
-		{[]string{"0.0.0.0/0:dns"}, []string{"0.0.0.0/0:53", "0.0.0.0/0:853", "0.0.0.0/0:windnsclient"}, true},
-		{[]string{"[::/0]:all"}, []string{"[::/0]:all"}, true},
-		{[]string{"10.0.0.1/32:windnsclient"}, []string{"10.0.0.1/32:windnsclient"}, true},
-		{[]string{"[2000::/3]:misconfigtun"}, []string{"[2000::/3]:misconfigtun"}, false},
-		{[]string{"1.1.1.0/24:tcp/1-65535", "1.1.1.0/24:udp/53-53"}, []string{"1.1.1.0/24:tcp", "1.1.1.0/24:udp/53"}, true},
-		{[]string{"1.1.1.0/24:20-30", "[::/0]:10-10"}, []string{"1.1.1.0/24:20-30", "[::/0]:10"}, false},
-		{[]string{"0.0.0.0/0:allexceptlan", "[::/0]:all"}, []string{"0.0.0.0/0:allexceptlan", "0.0.0.0/0:53", "0.0.0.0/0:853", "0.0.0.0/0:windnsclient", "[::/0]:all"}, true},
-		{[]string{"1.1.1.1/32:53", "1.1.1.1/32:0053", "1.1.1.1/24:53", "1.1.1.0/24:53", "53"}, []string{"1.1.1.1/32:53", "1.1.1.0/24:53", "53"}, true},
-		{[]string{"1.2.3.4/0:icmp", "[::1/0]:icmp", "icmp"}, []string{"0.0.0.0/0:icmp", "[::/0]:icmp", "icmp"}, false},
 	} {
 		leaks, err := ExpandWfpBlockLeak(c.values)
 		if err != nil {
@@ -58,65 +32,9 @@ func TestExpandWfpBlockLeak(t *testing.T) {
 			t.Errorf("%v: BlocksSystemDNS() = %v", c.values, got)
 		}
 	}
-	for _, value := range []string{
-		"", "ip", "tcp/", "udp/65536", "tcp/-1", "tcp/+53", "tcp/53/1", "udp/abc", "icmp/0", "icmp/8", "tcp:53", " dns",
-		"tcp/0-10", "tcp/20-10", "tcp/5-", "tcp/-5", "tcp/1-2-3", "tcp/1-65536", "udp/ 53", "all/0", "dns/53", "windnsclient/53",
-		"tcp/0", "udp/0", "tcp/00", "udp/0-0", "udp/65535-1",
-		// Ports alone.
-		"0", "00", "65536", "0-10", "20-10", "5-", "-5", "-", "1-2-3", "1-65536", "+53", " 53", "53 ", "53/1", "53/tcp", "0x35",
-		// IP versions are CIDRs now.
-		"ipv4", "ipv6", "ipv4:udp", "ipv6:all", "ipv4:dns", "tcpv4", "udpv6", "icmpv4", "tcp4", "dnsv4",
-		// CIDRs, IPv6 ones in brackets, but neither single addresses nor
-		// CIDRs on their own.
-		"1.1.1.0/24", "[2001:db8::/32]", "1.1.1.0/24:", "[::/0]:", ":udp", "[]:udp", "[:udp", "[::/0]udp",
-		"1.1.1.1:53", "[::1]:53", "[2001:db8::1]:tcp/53", "2001:db8::/32:53", "::/0:all", "[1.1.1.0/24]:53",
-		"[2001:db8::]/32:53", "1.1.1.0/33:53", "[::/129]:53", "1.1.1.0/24:1.1.1.0/24:53", "[::/0]:[::/0]:53",
-		"1.1.1.0/24 :53", "1.1.1.0/24: 53", " 1.1.1.0/24:53", "1.1.1.0/24::53", "[fe80::%1/64]:53", "geoip:cn:53",
-		"1.1.1.0/24:udp/0", "[::/0]:icmp/8", "1.1.1.0/24:dns/53", "[::/0]:20-10", "1.1.1.0/24:ipv4:53", "1.1.1.0/24:geoip",
-		"[::ffff:1.1.1.0/120]:53", "[::ffff:0:0/96]:all",
-	} {
+	for _, value := range []string{"", "ip", "tcp", "tcp/", "tcp/0", "udp/65536", "tcp/-1", "tcp/+53", "tcp/53/1", "udp/abc", "icmp/1", "tcp:53", " dns"} {
 		if _, err := ExpandWfpBlockLeak([]string{value}); err == nil {
 			t.Errorf("%q was accepted", value)
 		}
 	}
 }
-
-func TestLeakCovers(t *testing.T) {
-	for _, c := range []struct {
-		value    string
-		protocol string
-		port     uint16
-		covers   bool
-	}{
-		{"tcp", "tcp", 1, true},
-		{"tcp", "udp", 53, false},
-		{"udp/53", "udp", 53, true},
-		{"udp/53", "udp", 54, false},
-		{"tcp/10-20", "tcp", 10, true},
-		{"tcp/10-20", "tcp", 20, true},
-		{"tcp/10-20", "tcp", 21, false},
-		{"tcp/10-20", "tcp", 9, false},
-		{"53", "udp", 53, true},
-		{"53", "tcp", 53, true},
-		{"10-20", "tcp", 15, true},
-		{"10-20", "udp", 21, false},
-		{"1.1.1.0/24:udp/53", "udp", 53, true},
-		{"[::/0]:tcp", "tcp", 443, true},
-		{"[2001:db8::/32]:53", "tcp", 53, true},
-		{"0.0.0.0/0:icmp", "udp", 53, false},
-		{"all", "udp", 53, true},
-		{"1.1.1.1/32:all", "tcp", 1, true},
-		{"allexceptlan", "udp", 53, false},
-		{"misconfigtun", "udp", 53, false},
-		{"windnsclient", "udp", 53, false},
-	} {
-		l, ok := parseLeak(c.value)
-		if !ok {
-			t.Errorf("%q was not parsed", c.value)
-			continue
-		}
-		if got := l.covers(c.protocol, c.port); got != c.covers {
-			t.Errorf("%q covers %s/%d = %v", c.value, c.protocol, c.port, got)
-		}
-	}
-}
@@ -17,7 +17,7 @@ import (

 type bind struct {
 	ctx         context.Context
-	resolveFunc func(ctx context.Context, host string) (net.IP, error)
+	resolveFunc func(host string) (net.IP, error)
 	listenFunc  func(ctx context.Context) (net.PacketConn, error)
 	downFunc    func() error
 	reserved    []byte
@@ -143,11 +143,7 @@ func (b *bind) ParseEndpoint(s string) (conn.Endpoint, error) {
 	if port < 0 || port > 65535 {
 		return nil, errors.New("invalid port " + sport)
 	}
-	// up sets the connection's context right before it hands over the endpoint
-	b.mu.Lock()
-	ctx := b.ctx
-	b.mu.Unlock()
-	ip, err := b.resolveFunc(ctx, host)
+	ip, err := b.resolveFunc(host)
 	if err != nil {
 		return nil, err
 	}
@@ -323,12 +323,12 @@ func (h *Handler) up(ctx context.Context) error {
 	return h.dev.Up()
 }

-func MakeResolveLocal(d dns.Client, streamSettings *internet.MemoryStreamConfig) func(ctx context.Context, host string) (net.IP, error) {
-	return func(ctx context.Context, host string) (net.IP, error) {
+func MakeResolveLocal(d dns.Client, streamSettings *internet.MemoryStreamConfig) func(host string) (net.IP, error) {
+	return func(host string) (net.IP, error) {
 		if ip := net.ParseIP(host); ip != nil {
 			return ip, nil
 		}
-		ips, err := lookupIPContext(ctx, d, host)
+		ips, _, err := d.LookupIP(host, dns.IPOption{IPv4Enable: true, IPv6Enable: true})
 		if err != nil {
 			return nil, err
 		}
@@ -368,27 +368,6 @@ func MakeResolveLocal(d dns.Client, streamSettings *internet.MemoryStreamConfig)
 	}
 }

-func lookupIPContext(ctx context.Context, d dns.Client, host string) ([]net.IP, error) {
-	if err := ctx.Err(); err != nil {
-		return nil, err
-	}
-	type result struct {
-		ips []net.IP
-		err error
-	}
-	done := make(chan result, 1)
-	go func() {
-		ips, _, err := d.LookupIP(host, dns.IPOption{IPv4Enable: true, IPv6Enable: true})
-		done <- result{ips, err}
-	}()
-	select {
-	case r := <-done:
-		return r.ips, r.err
-	case <-ctx.Done():
-		return nil, ctx.Err()
-	}
-}
-
 type UDPConnClient struct {
 	net.PacketConn
 	Dest *net.UDPAddr
@@ -661,7 +661,7 @@ func TestVlessRealityFingerprints(t *testing.T) {
 	wg.Wait()
 }

-// A blocked connection must close after finalRules.delay even while the client keeps it open and sends nothing.
+// A blocked connection must be closed after blockDelay even while the client keeps it open and sends nothing.
 func TestVlessBlockDelay(t *testing.T) {
 	tcpServer := tcp.Server{
 		MsgProcessor: xor,
@@ -671,7 +671,7 @@ func TestVlessBlockDelay(t *testing.T) {
 	defer tcpServer.Close()

 	for _, delay := range []uint64{0, 1} {
-		t.Run(fmt.Sprint("delay=", delay), func(t *testing.T) {
+		t.Run(fmt.Sprint("blockDelay=", delay), func(t *testing.T) {
 			userID := protocol.NewID(uuid.New())
 			serverPort := tcp.PickPort()
 			serverConfig := &core.Config{
@@ -697,8 +697,8 @@ func TestVlessBlockDelay(t *testing.T) {
 						ProxySettings: serial.ToTypedMessage(&freedom.Config{
 							FinalRules: []*freedom.FinalRuleConfig{
 								{
-									Action: freedom.RuleAction_Block,
-									Delay:  &freedom.Range{Min: delay, Max: delay},
+									Action:     freedom.RuleAction_Block,
+									BlockDelay: &freedom.Range{Min: delay, Max: delay},
 								},
 							},
 						}),
@@ -726,15 +726,15 @@ func TestVlessBlockDelay(t *testing.T) {
 				Port:    dest.Port,
 			}, &encoding.Addons{}))

-			blockDuration := time.Duration(delay) * time.Second
-			common.Must(conn.SetReadDeadline(time.Now().Add(blockDuration + 5*time.Second)))
+			blockDelay := time.Duration(delay) * time.Second
+			common.Must(conn.SetReadDeadline(time.Now().Add(blockDelay + 5*time.Second)))
 			_, err = io.Copy(io.Discard, conn)
 			elapsed := time.Since(start)
 			if err, ok := err.(net.Error); ok && err.Timeout() {
 				t.Fatalf("connection is still open after %v", elapsed)
 			}
-			if elapsed < blockDuration {
-				t.Fatalf("connection is closed after %v, before finalRules.delay", elapsed)
+			if elapsed < blockDelay {
+				t.Fatalf("connection is closed after %v, before blockDelay", elapsed)
 			}
 		})
 	}
@@ -6,7 +6,6 @@ import (
 	goerrors "errors"
 	"io"
 	mrand "math/rand"
-	stdnet "net"
 	"net/netip"
 	"sync"
 	"time"
@@ -165,7 +164,7 @@ func (c *udpHopConn) recv(conn net.PacketConn) {
 		n, addr, err := conn.ReadFrom(p)
 		if err != nil {
 			pool.Put(p[:cap(p)])
-			if c.closed() || goerrors.Is(err, stdnet.ErrClosed) {
+			if c.closed() {
 				return
 			}
 			var netErr net.Error