From 4e0659ac042c65fc4a7b5a261b201628a38d23b0 Mon Sep 17 00:00:00 2001 From: gVisor bot Date: Thu, 2 Dec 2021 20:08:28 +0800 Subject: [PATCH] Revert "[test]" This reverts commit bf6bfdd9306f3d285023472be137e5feb8bfba95. --- tunnel/tunnel.go | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tunnel/tunnel.go b/tunnel/tunnel.go index c5973c85..ba5ef9c0 100644 --- a/tunnel/tunnel.go +++ b/tunnel/tunnel.go @@ -20,14 +20,13 @@ import ( ) var ( - tcpQueue = make(chan C.ConnContext, 200) - udpQueue = make(chan *inbound.PacketAdapter, 200) - natTable = nat.New() - rules []C.Rule - proxies = make(map[string]C.Proxy) - providers map[string]provider.ProxyProvider - ruleProviders map[string]provider.RuleProvider - configMux sync.RWMutex + tcpQueue = make(chan C.ConnContext, 200) + udpQueue = make(chan *inbound.PacketAdapter, 200) + natTable = nat.New() + rules []C.Rule + proxies = make(map[string]C.Proxy) + providers map[string]provider.ProxyProvider + configMux sync.RWMutex // Outbound Rule mode = Rule @@ -58,10 +57,9 @@ func Rules() []C.Rule { } // UpdateRules handle update rules -func UpdateRules(newRules []C.Rule, rp map[string]provider.RuleProvider) { +func UpdateRules(newRules []C.Rule) { configMux.Lock() rules = newRules - ruleProviders = rp configMux.Unlock() } @@ -75,10 +73,6 @@ func Providers() map[string]provider.ProxyProvider { return providers } -func RuleProviders() map[string]provider.RuleProvider { - return ruleProviders -} - // UpdateProxies handle update proxies func UpdateProxies(newProxies map[string]C.Proxy, newProviders map[string]provider.ProxyProvider) { configMux.Lock()