XTLS · yuhan6665 · Nov 12, 2023 · May 3, 2023 · May 4, 2023 · May 4, 2023
diff --git a/app/commander/config.pb.go b/app/commander/config.pb.go
diff --git a/app/dispatcher/config.pb.go b/app/dispatcher/config.pb.go
diff --git a/app/dns/config.pb.go b/app/dns/config.pb.go
diff --git a/app/dns/fakedns/fakedns.pb.go b/app/dns/fakedns/fakedns.pb.go
diff --git a/app/log/command/config.pb.go b/app/log/command/config.pb.go
diff --git a/app/log/config.pb.go b/app/log/config.pb.go
diff --git a/app/metrics/config.pb.go b/app/metrics/config.pb.go
diff --git a/app/observatory/command/command.pb.go b/app/observatory/command/command.pb.go
diff --git a/app/observatory/config.pb.go b/app/observatory/config.pb.go
diff --git a/app/policy/config.pb.go b/app/policy/config.pb.go
diff --git a/app/proxyman/command/command.pb.go b/app/proxyman/command/command.pb.go
diff --git a/app/proxyman/config.pb.go b/app/proxyman/config.pb.go
diff --git a/app/reverse/config.pb.go b/app/reverse/config.pb.go
diff --git a/app/router/command/command.pb.go b/app/router/command/command.pb.go
diff --git a/app/router/config.pb.go b/app/router/config.pb.go
diff --git a/app/stats/command/command.pb.go b/app/stats/command/command.pb.go
diff --git a/app/stats/config.pb.go b/app/stats/config.pb.go
diff --git a/common/log/log.pb.go b/common/log/log.pb.go
diff --git a/common/net/address.pb.go b/common/net/address.pb.go
diff --git a/common/net/destination.pb.go b/common/net/destination.pb.go
diff --git a/common/net/network.pb.go b/common/net/network.pb.go
diff --git a/common/net/port.pb.go b/common/net/port.pb.go
diff --git a/common/protocol/headers.pb.go b/common/protocol/headers.pb.go
diff --git a/common/protocol/server_spec.pb.go b/common/protocol/server_spec.pb.go
diff --git a/common/protocol/user.pb.go b/common/protocol/user.pb.go
diff --git a/common/serial/typed_message.pb.go b/common/serial/typed_message.pb.go
diff --git a/core/config.pb.go b/core/config.pb.go
diff --git a/infra/conf/freedom.go b/infra/conf/freedom.go
@@ -28,14 +28,31 @@ type Fragment struct {
 // Build implements Buildable
 func (c *FreedomConfig) Build() (proto.Message, error) {
 	config := new(freedom.Config)
-	config.DomainStrategy = freedom.Config_AS_IS
 	switch strings.ToLower(c.DomainStrategy) {
-	case "useip", "use_ip", "use-ip":
+	case "asis", "":
+		config.DomainStrategy = freedom.Config_AS_IS
+	case "useip":
 		config.DomainStrategy = freedom.Config_USE_IP
-	case "useip4", "useipv4", "use_ip4", "use_ipv4", "use_ip_v4", "use-ip4", "use-ipv4", "use-ip-v4":
+	case "useipv4":
 		config.DomainStrategy = freedom.Config_USE_IP4
-	case "useip6", "useipv6", "use_ip6", "use_ipv6", "use_ip_v6", "use-ip6", "use-ipv6", "use-ip-v6":
+	case "useipv6":
 		config.DomainStrategy = freedom.Config_USE_IP6
+	case "useipv4v6":
+		config.DomainStrategy = freedom.Config_USE_IP46
+	case "useipv6v4":
+		config.DomainStrategy = freedom.Config_USE_IP64
+	case "forceip":
+		config.DomainStrategy = freedom.Config_FORCE_IP
+	case "forceipv4":
+		config.DomainStrategy = freedom.Config_FORCE_IP4
+	case "forceipv6":
+		config.DomainStrategy = freedom.Config_FORCE_IP6
+	case "forceipv4v6":
+		config.DomainStrategy = freedom.Config_FORCE_IP46
+	case "forceipv6v4":
+		config.DomainStrategy = freedom.Config_FORCE_IP64
+	default:
+		return nil, newError("unsupported domain strategy: ", c.DomainStrategy)
 	}
 
 	if c.Fragment != nil {

diff --git a/proxy/blackhole/config.pb.go b/proxy/blackhole/config.pb.go
diff --git a/proxy/dns/config.pb.go b/proxy/dns/config.pb.go
diff --git a/proxy/dokodemo/config.pb.go b/proxy/dokodemo/config.pb.go
diff --git a/proxy/freedom/config.go b/proxy/freedom/config.go
@@ -1,5 +1,44 @@
 package freedom
 
-func (c *Config) useIP() bool {
-	return c.DomainStrategy == Config_USE_IP || c.DomainStrategy == Config_USE_IP4 || c.DomainStrategy == Config_USE_IP6
+var strategy = [][]byte{
+	//              name        strategy,   prefer, fallback
+	{0, 0, 0}, //   AsIs        none,       /,      /
+	{1, 0, 0}, //   UseIP       use,        both,   none
+	{1, 4, 0}, //   UseIPv4     use,        4,      none
+	{1, 6, 0}, //   UseIPv6     use,        6,      none
+	{1, 4, 6}, //   UseIPv4v6   use,        4,      6
+	{1, 6, 4}, //   UseIPv6v4   use,        6,      4
+	{2, 0, 0}, //   ForceIP     force,      both,   none
+	{2, 4, 0}, //   ForceIPv4   force,      4,      none
+	{2, 6, 0}, //   ForceIPv6   force,      6,      none
+	{2, 4, 6}, //   ForceIPv4v6 force,      4,      6
+	{2, 6, 4}, //   ForceIPv6v4 force,      6,      4
+}
+
+func (c *Config) hasStrategy() bool {
+	return strategy[c.DomainStrategy][0] != 0
+}
+
+func (c *Config) forceIP() bool {
+	return strategy[c.DomainStrategy][0] == 2
+}
+
+func (c *Config) preferIP4() bool {
+	return strategy[c.DomainStrategy][1] == 4 || strategy[c.DomainStrategy][1] == 0
+}
+
+func (c *Config) preferIP6() bool {
+	return strategy[c.DomainStrategy][1] == 6 || strategy[c.DomainStrategy][1] == 0
+}
+
+func (c *Config) hasFallback() bool {
+	return strategy[c.DomainStrategy][2] != 0
+}
+
+func (c *Config) fallbackIP4() bool {
+	return strategy[c.DomainStrategy][2] == 4
+}
+
+func (c *Config) fallbackIP6() bool {
+	return strategy[c.DomainStrategy][2] == 6
 }