Handle EDNS version downgrade

Co-authored-by: anytls <anytls>

cmd/sing-box/cmd_rule_set_match.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"io"
 	"os"
-	"path/filepath"
 
 	"github.com/sagernet/sing-box/adapter"
 	"github.com/sagernet/sing-box/common/srs"
@@ -57,14 +56,6 @@ func ruleSetMatch(sourcePath string, domain string) error {
 	if err != nil {
 		return E.Cause(err, "read rule-set")
 	}
-	if flagRuleSetMatchFormat == "" {
-		switch filepath.Ext(sourcePath) {
-		case ".json":
-			flagRuleSetMatchFormat = C.RuleSetFormatSource
-		case ".srs":
-			flagRuleSetMatchFormat = C.RuleSetFormatBinary
-		}
-	}
 	var ruleSet option.PlainRuleSetCompat
 	switch flagRuleSetMatchFormat {
 	case C.RuleSetFormatSource:

common/listener/listener_udp.go

@@ -37,12 +37,6 @@ func (l *Listener) ListenUDP() (net.PacketConn, error) {
 	return udpConn, err
 }
 
-func (l *Listener) DialContext(dialer net.Dialer, ctx context.Context, network string, address string) (net.Conn, error) {
-	return ListenNetworkNamespace[net.Conn](l.listenOptions.NetNs, func() (net.Conn, error) {
-		return dialer.DialContext(ctx, network, address)
-	})
-}
-
 func (l *Listener) ListenPacket(listenConfig net.ListenConfig, ctx context.Context, network string, address string) (net.PacketConn, error) {
 	return ListenNetworkNamespace[net.PacketConn](l.listenOptions.NetNs, func() (net.PacketConn, error) {
 		return listenConfig.ListenPacket(ctx, network, address)

docs/configuration/rule-set/index.md

@@ -80,8 +80,6 @@ List of [Headless Rule](./headless-rule/).
 
 Format of rule-set file, `source` or `binary`.
 
-Optional when `path` or `url` uses `json` or `srs` as extension.
-
 ### Local Fields
 
 #### path

docs/configuration/rule-set/index.zh.md

@@ -80,8 +80,6 @@
 
 规则集格式， `source` 或 `binary`。
 
-当 `path` 或 `url` 使用 `json` 或 `srs` 作为扩展名时可选。
-
 ### 本地字段
 
 #### path

protocol/redirect/tproxy.go

@@ -154,11 +154,10 @@ func (w *tproxyPacketWriter) WritePacket(buffer *buf.Buffer, destination M.Socks
 			return err
 		}
 	}
-	var dialer net.Dialer
+	var listenConfig net.ListenConfig
-	dialer.LocalAddr = destination.UDPAddr()
+	listenConfig.Control = control.Append(listenConfig.Control, control.ReuseAddr())
-	dialer.Control = control.Append(dialer.Control, control.ReuseAddr())
+	listenConfig.Control = control.Append(listenConfig.Control, redir.TProxyWriteBack())
-	dialer.Control = control.Append(dialer.Control, redir.TProxyWriteBack())
+	packetConn, err := w.listener.ListenPacket(listenConfig, w.ctx, "udp", destination.String())
-	packetConn, err := w.listener.DialContext(dialer, w.ctx, "udp", w.source.String())
 	if err != nil {
 		return err
 	}