From afbda60dfba4e8317c8040623cda305ddd38411f Mon Sep 17 00:00:00 2001 From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com> Date: Tue, 16 Mar 2021 15:19:25 +0800 Subject: [PATCH] format NFController --- Netch/Controllers/NFController.cs | 64 +++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Netch/Controllers/NFController.cs b/Netch/Controllers/NFController.cs index 90958ea8..3539d9be 100644 --- a/Netch/Controllers/NFController.cs +++ b/Netch/Controllers/NFController.cs @@ -47,11 +47,11 @@ namespace Netch.Controllers #region aio_dial - aio_dial((int)NameList.TYPE_FILTERLOOPBACK, "false"); - aio_dial((int)NameList.TYPE_TCPLISN, Global.Settings.RedirectorTCPPort.ToString()); + aio_dial((int) NameList.TYPE_FILTERLOOPBACK, "false"); + aio_dial((int) NameList.TYPE_TCPLISN, Global.Settings.RedirectorTCPPort.ToString()); - aio_dial((int)NameList.TYPE_FILTERUDP, (Global.Settings.ProcessProxyProtocol != PortType.TCP).ToString().ToLower()); - aio_dial((int)NameList.TYPE_FILTERTCP, (Global.Settings.ProcessProxyProtocol != PortType.UDP).ToString().ToLower()); + aio_dial((int) NameList.TYPE_FILTERUDP, (Global.Settings.ProcessProxyProtocol != PortType.TCP).ToString().ToLower()); + aio_dial((int) NameList.TYPE_FILTERTCP, (Global.Settings.ProcessProxyProtocol != PortType.UDP).ToString().ToLower()); SetServer(Global.Settings.ProcessProxyProtocol); if (!CheckRule(mode.FullRule, out var list)) @@ -62,12 +62,12 @@ namespace Netch.Controllers #endregion if (Global.Settings.RedirectDNS) - aio_dial((int)NameList.TYPE_REDIRCTOR_DNS, Global.Settings.RedirectDNSAddr.ToString()); + aio_dial((int) NameList.TYPE_REDIRCTOR_DNS, Global.Settings.RedirectDNSAddr); if (Global.Settings.RedirectICMP) - aio_dial((int)NameList.TYPE_REDIRCTOR_ICMP, Global.Settings.RedirectICMPAddr.ToString()); + aio_dial((int) NameList.TYPE_REDIRCTOR_ICMP, Global.Settings.RedirectICMPAddr); - aio_dial((int)NameList.TYPE_FILTERCHILDPROC, Global.Settings.ChildProcessHandle.ToString()); + aio_dial((int) NameList.TYPE_FILTERCHILDPROC, Global.Settings.ChildProcessHandle.ToString()); if (!aio_init()) throw new MessageException("Redirector Start failed, run Netch with \"-console\" argument"); @@ -86,7 +86,7 @@ namespace Netch.Controllers public static bool CheckRule(IEnumerable rules, out IEnumerable incompatibleRule) { incompatibleRule = rules.Where(r => !CheckCppRegex(r, false)); - aio_dial((int)NameList.TYPE_CLRNAME, ""); + aio_dial((int) NameList.TYPE_CLRNAME, ""); return !incompatibleRule.Any(); } @@ -100,14 +100,14 @@ namespace Netch.Controllers try { if (r.StartsWith("!")) - return aio_dial((int)NameList.TYPE_ADDNAME, r.Substring(1)); + return aio_dial((int) NameList.TYPE_ADDNAME, r.Substring(1)); - return aio_dial((int)NameList.TYPE_ADDNAME, r); + return aio_dial((int) NameList.TYPE_ADDNAME, r); } finally { if (clear) - aio_dial((int)NameList.TYPE_CLRNAME, ""); + aio_dial((int) NameList.TYPE_CLRNAME, ""); } } @@ -177,50 +177,50 @@ namespace Netch.Controllers if (server is Socks5 socks5) { - aio_dial((int)NameList.TYPE_TCPTYPE + offset, "Socks5"); - aio_dial((int)NameList.TYPE_TCPHOST + offset, $"{socks5.AutoResolveHostname()}:{socks5.Port}"); - aio_dial((int)NameList.TYPE_TCPUSER + offset, socks5.Username ?? string.Empty); - aio_dial((int)NameList.TYPE_TCPPASS + offset, socks5.Password ?? string.Empty); - aio_dial((int)NameList.TYPE_TCPMETH + offset, string.Empty); + aio_dial((int) NameList.TYPE_TCPTYPE + offset, "Socks5"); + aio_dial((int) NameList.TYPE_TCPHOST + offset, $"{socks5.AutoResolveHostname()}:{socks5.Port}"); + aio_dial((int) NameList.TYPE_TCPUSER + offset, socks5.Username ?? string.Empty); + aio_dial((int) NameList.TYPE_TCPPASS + offset, socks5.Password ?? string.Empty); + aio_dial((int) NameList.TYPE_TCPMETH + offset, string.Empty); } else if (server is Shadowsocks shadowsocks && !shadowsocks.HasPlugin() && Global.Settings.RedirectorSS) { - aio_dial((int)NameList.TYPE_TCPTYPE + offset, "Shadowsocks"); - aio_dial((int)NameList.TYPE_TCPHOST + offset, $"{shadowsocks.AutoResolveHostname()}:{shadowsocks.Port}"); - aio_dial((int)NameList.TYPE_TCPMETH + offset, shadowsocks.EncryptMethod ?? string.Empty); - aio_dial((int)NameList.TYPE_TCPPASS + offset, shadowsocks.Password ?? string.Empty); + aio_dial((int) NameList.TYPE_TCPTYPE + offset, "Shadowsocks"); + aio_dial((int) NameList.TYPE_TCPHOST + offset, $"{shadowsocks.AutoResolveHostname()}:{shadowsocks.Port}"); + aio_dial((int) NameList.TYPE_TCPMETH + offset, shadowsocks.EncryptMethod); + aio_dial((int) NameList.TYPE_TCPPASS + offset, shadowsocks.Password); } else { - aio_dial((int)NameList.TYPE_TCPTYPE + offset, "Socks5"); - aio_dial((int)NameList.TYPE_TCPHOST + offset, $"127.0.0.1:{controller.Socks5LocalPort()}"); - aio_dial((int)NameList.TYPE_TCPUSER + offset, string.Empty); - aio_dial((int)NameList.TYPE_TCPPASS + offset, string.Empty); - aio_dial((int)NameList.TYPE_TCPMETH + offset, string.Empty); + aio_dial((int) NameList.TYPE_TCPTYPE + offset, "Socks5"); + aio_dial((int) NameList.TYPE_TCPHOST + offset, $"127.0.0.1:{controller.Socks5LocalPort()}"); + aio_dial((int) NameList.TYPE_TCPUSER + offset, string.Empty); + aio_dial((int) NameList.TYPE_TCPPASS + offset, string.Empty); + aio_dial((int) NameList.TYPE_TCPMETH + offset, string.Empty); } } private void SetName(Mode mode) { - aio_dial((int)NameList.TYPE_CLRNAME, ""); + aio_dial((int) NameList.TYPE_CLRNAME, ""); foreach (var rule in mode.FullRule) { if (rule.StartsWith("!")) { - aio_dial((int)NameList.TYPE_BYPNAME, rule.Substring(1)); + aio_dial((int) NameList.TYPE_BYPNAME, rule.Substring(1)); continue; } - aio_dial((int)NameList.TYPE_ADDNAME, rule); + aio_dial((int) NameList.TYPE_ADDNAME, rule); } - aio_dial((int)NameList.TYPE_ADDNAME, @"NTT\.exe"); - aio_dial((int)NameList.TYPE_BYPNAME, "^" + Global.NetchDir.ToRegexString() + @"((?!NTT\.exe).)*$"); + aio_dial((int) NameList.TYPE_ADDNAME, @"NTT\.exe"); + aio_dial((int) NameList.TYPE_BYPNAME, "^" + Global.NetchDir.ToRegexString() + @"((?!NTT\.exe).)*$"); } #region NativeMethods - private const int UdpNameListOffset = (int)NameList.TYPE_UDPTYPE - (int)NameList.TYPE_TCPTYPE; + private const int UdpNameListOffset = (int) NameList.TYPE_UDPTYPE - (int) NameList.TYPE_TCPTYPE; [DllImport("Redirector.bin", CallingConvention = CallingConvention.Cdecl)] private static extern bool aio_dial(int name, [MarshalAs(UnmanagedType.LPWStr)] string value); @@ -244,7 +244,7 @@ namespace Netch.Controllers TYPE_FILTERTCP, TYPE_FILTERUDP, TYPE_FILTERIP, - TYPE_FILTERCHILDPROC,//子进程捕获 + TYPE_FILTERCHILDPROC, //子进程捕获 TYPE_TCPLISN, TYPE_TCPTYPE,