Merge remote-tracking branch 'origin/dev_new' into dev_new

conf/sing.go

@@ -1,5 +1,9 @@
 package conf
 
+import (
+	"github.com/inazumav/sing-box/option"
+)
+
 type SingConfig struct {
 	LogConfig    SingLogConfig `json:"Log"`
 	NtpConfig    SingNtpConfig `json:"NTP"`
@@ -31,6 +35,7 @@ type SingOptions struct {
 	EnableProxyProtocol      bool                   `json:"EnableProxyProtocol"`
 	TCPFastOpen              bool                   `json:"EnableTFO"`
 	SniffEnabled             bool                   `json:"EnableSniff"`
+	DomainStrategy           option.DomainStrategy  `json:"DomainStrategy"`
 	SniffOverrideDestination bool                   `json:"SniffOverrideDestination"`
 	FallBackConfigs          *FallBackConfigForSing `json:"FallBackConfigs"`
 }

core/sing/node.go

@@ -38,6 +38,7 @@ func getInboundOptions(tag string, info *panel.NodeInfo, c *conf.Options) (optio
 		InboundOptions: option.InboundOptions{
 			SniffEnabled:             c.SingOptions.SniffEnabled,
 			SniffOverrideDestination: c.SingOptions.SniffOverrideDestination,
+			DomainStrategy:           c.SingOptions.DomainStrategy,
 		},
 	}
 	var tls option.InboundTLSOptions

example/config.json

@@ -63,7 +63,12 @@
       // 开启 Proxy Protocol，参见 https://github.com/haproxy/haproxy/blob/master/doc/proxy-protocol.txt
       "EnableProxyProtocol": false,
       // 开启 TCP Fast Open
-      "EnableTFO": true
+      "EnableTFO": true,
+
+      // 设置 Domain Strategy
+      // 可选 prefer_ipv4 / prefer_ipv6 / ipv4_only / ipv6_only
+      "DomainStrategy": "ipv4_only",
+
       // More
     }
     /*,
@@ -81,6 +86,7 @@
             "Core": "sing",
             "EnableProxyProtocol": true,
             "EnableTFO": true
+            "DomainStrategy": "ipv4_only",
           }
         },
         {