GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-03-18 18:13:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: force using ss-libev if using plugin

Browse Source
This commit is contained in:
ChsBuffer
2020-12-15 17:11:25 +08:00
parent e77a40966c
commit a3d309113c
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Netch/Servers/Shadowsocks/SSController.cs
View File

@@ -15,15 +15,13 @@ namespace Netch.Servers.Shadowsocks
public ushort? Socks5LocalPort { get; set; }
public string LocalAddress { get; set; }
private Mode _savedMode;
public bool DllFlag;
public bool Start(in Server s, in Mode mode)
{
_savedMode = mode;
Server = s;
var server = (Shadowsocks) s;
DllFlag = Global.Settings.BootShadowsocksFromDLL && (_savedMode.Type == 0 || _savedMode.Type == 1 || _savedMode.Type == 2);
DllFlag = Global.Settings.BootShadowsocksFromDLL && mode.Type is 0 or 1 or 2 && !server.HasPlugin();
//从DLL启动Shaowsocks
if (DllFlag)
@@ -82,7 +80,6 @@ namespace Netch.Servers.Shadowsocks
ShadowsocksDLL.Stop();
else
StopInstance();
_savedMode = null;
}
private class ShadowsocksDLL

2
Netch/Servers/Shadowsocks/Shadowsocks.cs
View File

@@ -29,6 +29,8 @@ namespace Netch.Servers.Shadowsocks
{
Type = "SS";
}
public bool HasPlugin() => string.IsNullOrWhiteSpace(Plugin) && string.IsNullOrWhiteSpace(PluginOption);
}
public static class SSGlobal