From b69e52d4d72846b8201a4073ed68c4c332c40db9 Mon Sep 17 00:00:00 2001 From: wwqgtxx Date: Tue, 21 Jan 2025 00:45:49 +0800 Subject: [PATCH] chore: deprecated `routing-mark` and `interface-name` of the group, please set it directly on the proxy instead --- adapter/outbound/base.go | 6 +++--- adapter/outboundgroup/groupbase.go | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/adapter/outbound/base.go b/adapter/outbound/base.go index dd226f74a..56bed9d53 100644 --- 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 index 69fbb6179..f2a567ae8 100644 --- 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)