From 7564e79ede34fdf1773029c7879f75f7bde187fd Mon Sep 17 00:00:00 2001 From: HYec Date: Tue, 9 Jan 2018 23:08:50 +0800 Subject: [PATCH] Only start the current server's plugin --- .../Controller/ShadowsocksController.cs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs index f0df59bd..7ae00824 100644 --- a/shadowsocks-csharp/Controller/ShadowsocksController.cs +++ b/shadowsocks-csharp/Controller/ShadowsocksController.cs @@ -520,7 +520,6 @@ namespace Shadowsocks.Controller _listener.Stop(); } - // StopPlugins(); // don't put PrivoxyRunner.Start() before pacServer.Stop() @@ -536,7 +535,7 @@ namespace Shadowsocks.Controller strategy.ReloadServers(); } - StartPlugins(); + StartPlugin(); privoxyRunner.Start(_config); TCPRelay tcpRelay = new TCPRelay(this, _config); @@ -556,8 +555,7 @@ namespace Shadowsocks.Controller if (e is SocketException) { SocketException se = (SocketException)e; - if (se.SocketErrorCode == SocketError.AccessDenied || - se.SocketErrorCode == SocketError.AddressAlreadyInUse) + if (se.SocketErrorCode == SocketError.AccessDenied) { e = new Exception(I18N.GetString("Port already in use"), e); } @@ -575,13 +573,10 @@ namespace Shadowsocks.Controller Utils.ReleaseMemory(true); } - private void StartPlugins() + private void StartPlugin() { - foreach (var server in _config.configs) - { - // Early start plugin processes - GetPluginLocalEndPointIfConfigured(server); - } + var server = _config.GetCurrentServer(); + GetPluginLocalEndPointIfConfigured(server); } protected void SaveConfig(Configuration newConfig)