From e194efcecbe029292ccfed5a90ac9491ff0571d9 Mon Sep 17 00:00:00 2001 From: MetaCubeX Date: Thu, 17 Mar 2022 01:51:28 +0800 Subject: [PATCH] Migration: go 1.18 --- adapter/outboundgroup/fallback.go | 2 +- adapter/outboundgroup/selector.go | 2 +- adapter/outboundgroup/urltest.go | 2 +- go.mod | 1 + go.sum | 4 ++++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/adapter/outboundgroup/fallback.go b/adapter/outboundgroup/fallback.go index caf4fb5e..15486111 100644 --- a/adapter/outboundgroup/fallback.go +++ b/adapter/outboundgroup/fallback.go @@ -116,7 +116,7 @@ func (f *Fallback) Unwrap(metadata *C.Metadata) C.Proxy { func (f *Fallback) proxies(touch bool) []C.Proxy { elm, _, _ := f.single.Do(func() (any, error) { - return getProvidersProxies(f.providers, touch), nil + return getProvidersProxies(f.providers, touch, f.filter), nil }) return elm.([]C.Proxy) diff --git a/adapter/outboundgroup/selector.go b/adapter/outboundgroup/selector.go index 11fc076a..32a8f247 100644 --- a/adapter/outboundgroup/selector.go +++ b/adapter/outboundgroup/selector.go @@ -79,7 +79,7 @@ func (s *Selector) Set(name string) error { } // Unwrap implements C.ProxyAdapter -func (s *Selector) Unwrap(metadata *C.Metadata) C.Proxy { +func (s *Selector) Unwrap(*C.Metadata) C.Proxy { return s.selectedProxy(true) } diff --git a/adapter/outboundgroup/urltest.go b/adapter/outboundgroup/urltest.go index 67f7ce1b..60b28273 100644 --- a/adapter/outboundgroup/urltest.go +++ b/adapter/outboundgroup/urltest.go @@ -66,7 +66,7 @@ func (u *URLTest) ListenPacketContext(ctx context.Context, metadata *C.Metadata, } // Unwrap implements C.ProxyAdapter -func (u *URLTest) Unwrap(metadata *C.Metadata) C.Proxy { +func (u *URLTest) Unwrap(*C.Metadata) C.Proxy { return u.fast(true) } diff --git a/go.mod b/go.mod index 5f251602..c2bef42b 100644 --- a/go.mod +++ b/go.mod @@ -51,6 +51,7 @@ require ( golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect golang.org/x/tools v0.1.10 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + golang.zx2c4.com/go118/netip v0.0.0-20211106132939-9d41d90554dd // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect ) diff --git a/go.sum b/go.sum index b19aef68..dd4e55ee 100644 --- a/go.sum +++ b/go.sum @@ -352,8 +352,12 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1N golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.zx2c4.com/go118/netip v0.0.0-20211106132939-9d41d90554dd h1:gUHae7sCd+tFJLcCximWeBFD2b6Jg3O7UaNaPvjIJHc= +golang.zx2c4.com/go118/netip v0.0.0-20211106132939-9d41d90554dd/go.mod h1:5yyfuiqVIJ7t+3MqrpTQ+QqRkMWiESiyDvPNvKYCecg= golang.zx2c4.com/wireguard/windows v0.5.1 h1:OnYw96PF+CsIMrqWo5QP3Q59q5hY1rFErk/yN3cS+JQ= golang.zx2c4.com/wireguard/windows v0.5.1/go.mod h1:EApyTk/ZNrkbZjurHL1nleDYnsPpJYBO7LZEBCyDAHk= +golang.zx2c4.com/wireguard/windows v0.5.2 h1:C3kUahG6QPhXUYSMesW0t1mDo1XCwls2c8Bz16umS44= +golang.zx2c4.com/wireguard/windows v0.5.2/go.mod h1:KptYG5fXTsP1sHafw0BnWHxobtR6QZHWY6SVWq5R0PM= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=