chore: deprecated routing-mark and interface-name of the group, please set it directly on the proxy instead

wwqgtxx · wwqgtxx · commit b69e52d4d728 · 2025-01-21T00:45:49.000+08:00
diff --git a/adapter/outbound/base.go b/adapter/outbound/base.go
@@ -153,11 +153,11 @@ func (b *Base) DialOptions(opts ...dialer.Option) []dialer.Option {
 }
 
 type BasicOption struct {
-	TFO         bool   `proxy:"tfo,omitempty" group:"tfo,omitempty"`
-	MPTCP       bool   `proxy:"mptcp,omitempty" group:"mptcp,omitempty"`
+	TFO         bool   `proxy:"tfo,omitempty"`
+	MPTCP       bool   `proxy:"mptcp,omitempty"`
 	Interface   string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
 	RoutingMark int    `proxy:"routing-mark,omitempty" group:"routing-mark,omitempty"`
-	IPVersion   string `proxy:"ip-version,omitempty" group:"ip-version,omitempty"`
+	IPVersion   string `proxy:"ip-version,omitempty"`
 	DialerProxy string `proxy:"dialer-proxy,omitempty"` // don't apply this option into groups, but can set a group name in a proxy
 }
 
diff --git a/adapter/outboundgroup/groupbase.go b/adapter/outboundgroup/groupbase.go
@@ -46,6 +46,13 @@ type GroupBaseOption struct {
 }
 
 func NewGroupBase(opt GroupBaseOption) *GroupBase {
+	if opt.RoutingMark != 0 {
+		log.Warnln("The group [%s] with routing-mark configuration is deprecated, please set it directly on the proxy instead", opt.Name)
+	}
+	if opt.Interface != "" {
+		log.Warnln("The group [%s] with interface-name configuration is deprecated, please set it directly on the proxy instead", opt.Name)
+	}
+
 	var excludeFilterReg *regexp2.Regexp
 	if opt.excludeFilter != "" {
 		excludeFilterReg = regexp2.MustCompile(opt.excludeFilter, regexp2.None)

Original file line number	Diff line number	Diff line change
`@@ -153,11 +153,11 @@ func (b *Base) DialOptions(opts ...dialer.Option) []dialer.Option {`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`type BasicOption struct {`
`156`		- TFO bool `proxy:"tfo,omitempty" group:"tfo,omitempty"`
`157`		- MPTCP bool `proxy:"mptcp,omitempty" group:"mptcp,omitempty"`
	`156`	+ TFO bool `proxy:"tfo,omitempty"`
	`157`	+ MPTCP bool `proxy:"mptcp,omitempty"`
`158`	`158`	Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
`159`	`159`	RoutingMark int `proxy:"routing-mark,omitempty" group:"routing-mark,omitempty"`
`160`		- IPVersion string `proxy:"ip-version,omitempty" group:"ip-version,omitempty"`
	`160`	+ IPVersion string `proxy:"ip-version,omitempty"`
`161`	`161`	DialerProxy string `proxy:"dialer-proxy,omitempty"` // don't apply this option into groups, but can set a group name in a proxy
`162`	`162`	`}`
`163`	`163`