Fix DNS issue in TUN mode (#824 )

Merge pull request #823 from H1JK/patch-update
Replace Xray-core with SagerNet/v2ray-core, with more protocol support
2026-05-11 23:45:06 +08:00 · 2022-06-09 21:42:27 +08:00 · 2022-06-09 20:59:28 +08:00 · 2022-06-09 20:52:37 +08:00 · 2022-06-09 20:52:18 +08:00 · 2022-06-09 20:52:10 +08:00
46 changed files with 538 additions and 362 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,10 +52,10 @@ jobs:
          files: .\other\release\aiodns.bin

      - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
        if: steps.check_other.outputs.files_exists == 'false'
        with:
-          go-version: 1.17.3
+          go-version: ^1.18.3

      - name: Setup C++
        uses: msys2/setup-msys2@v2
@@ -83,7 +83,7 @@ jobs:
          .\build.ps1 -Configuration Release -OutputPath release

      - name: Upload
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: release
          path: release
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,10 +48,10 @@ jobs:
          files: .\other\release\aiodns.bin

      - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
        if: steps.check_other.outputs.files_exists == 'false'
        with:
-          go-version: 1.17.3
+          go-version: ^1.18.3

      - name: Setup C++
        uses: msys2/setup-msys2@v2
--- a/Netch/Controllers/MainController.cs
+++ b/Netch/Controllers/MainController.cs
@@ -57,7 +57,7 @@ public static class MainController
                // Start Server Controller to get a local socks5 server
                Log.Debug("Server Information: {Data}", $"{server.Type} {server.MaskedData()}");

-                ServerController = ServerHelper.GetUtilByTypeName(server.Type).GetController();
+                ServerController = new V2rayController();
                Global.MainForm.StatusText(i18N.TranslateFormat("Starting {0}", ServerController.Name));

                TryReleaseTcpPort(ServerController.Socks5LocalPort(), "Socks5");
--- a/Netch/Controllers/TUNController.cs
+++ b/Netch/Controllers/TUNController.cs
@@ -93,7 +93,7 @@ namespace Netch.Controllers

            if (_tunConfig.UseCustomDNS)
            {
-                Dial(NameList.TYPE_DNSADDR, _tunConfig.DNS);
+                Dial(NameList.TYPE_DNSADDR, DnsUtils.AppendPort(_tunConfig.DNS));
            }
            else
            {
@@ -175,8 +175,13 @@ namespace Netch.Controllers

            if (_tunConfig.UseCustomDNS)
            {
-                // NOTICE: DNS metric is network interface metric
-                RouteUtils.CreateRoute(_tun.FillTemplate(_tunConfig.DNS, 32));
+                if (_tunConfig.ProxyDNS)
+                {
+                    // NOTICE: DNS metric is network interface metric
+                    RouteUtils.CreateRoute(_tun.FillTemplate(_tunConfig.DNS, 32));
+                }
+
+                tunNetworkInterface.SetDns(_tunConfig.DNS);
            }
            else
            {
--- a/Netch/Controllers/UpdateChecker.cs
+++ b/Netch/Controllers/UpdateChecker.cs
@@ -15,7 +15,7 @@ public static class UpdateChecker
    public const string Name = @"Netch";
    public const string Copyright = @"Copyright © 2019 - 2022";

-    public const string AssemblyVersion = @"1.9.5";
+    public const string AssemblyVersion = @"1.9.6";
    private const string Suffix = @"";

    public static readonly string Version = $"{AssemblyVersion}{(string.IsNullOrEmpty(Suffix) ? "" : $"-{Suffix}")}";
--- a/Netch/Forms/AboutForm.Designer.cs
+++ b/Netch/Forms/AboutForm.Designer.cs
@@ -28,38 +28,11 @@
        /// </summary>
        private void InitializeComponent()
        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutForm));
-            this.SponsorGroupBox = new System.Windows.Forms.GroupBox();
-            this.SponsorPictureBox = new System.Windows.Forms.PictureBox();
            this.ChannelLabel = new System.Windows.Forms.LinkLabel();
            this.NetchPictureBox = new System.Windows.Forms.PictureBox();
-            this.SponsorGroupBox.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.SponsorPictureBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.NetchPictureBox)).BeginInit();
            this.SuspendLayout();
            // 
-            // SponsorGroupBox
-            // 
-            this.SponsorGroupBox.Controls.Add(this.SponsorPictureBox);
-            this.SponsorGroupBox.Location = new System.Drawing.Point(12, 235);
-            this.SponsorGroupBox.Name = "SponsorGroupBox";
-            this.SponsorGroupBox.Size = new System.Drawing.Size(314, 229);
-            this.SponsorGroupBox.TabIndex = 2;
-            this.SponsorGroupBox.TabStop = false;
-            this.SponsorGroupBox.Text = "Sponsor";
-            // 
-            // SponsorPictureBox
-            // 
-            this.SponsorPictureBox.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.SponsorPictureBox.Image = global::Netch.Properties.Resources.Sponsor;
-            this.SponsorPictureBox.Location = new System.Drawing.Point(6, 22);
-            this.SponsorPictureBox.Name = "SponsorPictureBox";
-            this.SponsorPictureBox.Size = new System.Drawing.Size(300, 200);
-            this.SponsorPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.SponsorPictureBox.TabIndex = 1;
-            this.SponsorPictureBox.TabStop = false;
-            this.SponsorPictureBox.Click += new System.EventHandler(this.SponsorPictureBox_Click);
-            // 
            // ChannelLabel
            // 
            this.ChannelLabel.AutoSize = true;
@@ -87,11 +60,10 @@
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(338, 474);
+            this.ClientSize = new System.Drawing.Size(338, 244);
            this.Controls.Add(this.ChannelLabel);
-            this.Controls.Add(this.SponsorGroupBox);
            this.Controls.Add(this.NetchPictureBox);
-            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.MaximizeBox = false;
@@ -99,8 +71,6 @@
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
            this.Text = "About";
            this.Load += new System.EventHandler(this.AboutForm_Load);
-            this.SponsorGroupBox.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.SponsorPictureBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.NetchPictureBox)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();
@@ -110,8 +80,6 @@
        #endregion

        private System.Windows.Forms.PictureBox NetchPictureBox;
-        private System.Windows.Forms.PictureBox SponsorPictureBox;
-        private System.Windows.Forms.GroupBox SponsorGroupBox;
        private System.Windows.Forms.LinkLabel ChannelLabel;
    }
 }
--- a/Netch/Forms/AboutForm.resx
+++ b/Netch/Forms/AboutForm.resx
@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Backup.csproj
+++ b/Backup.csproj
@@ -1,101 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\common.props" />
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <Configurations>Debug;Release</Configurations>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <ApplicationManifest>App.manifest</ApplicationManifest>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <ApplicationIcon>Resources\Netch.ico</ApplicationIcon>
-    <IsPackable>false</IsPackable>
-    <!-- event handler async void Warning -->
-    <NoWarn>VSTHRD100</NoWarn>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisMode>Default</AnalysisMode>
-    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
-    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DebugType>none</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Using Include="Serilog" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Fody" Version="6.6.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="HMBSbige.SingleInstance" Version="6.0.0" />
-    <PackageReference Include="MaxMind.GeoIP2" Version="4.0.1" />
-    <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.73" GeneratePathProperty="true" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.0.64" />
-    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.588-beta">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Nullable.Extended.Analyzer" Version="1.10.4539">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.Extensions.Hosting" Version="4.2.0" />
-    <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
-    <PackageReference Include="Stun.Net" Version="6.0.0" />
-    <PackageReference Include="System.Management" Version="6.0.0" />
-    <PackageReference Include="TaskScheduler" Version="2.9.2" />
-    <PackageReference Include="WindowsFirewallHelper" Version="2.1.4.81" />
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
-    <PackageReference Include="WindowsJobAPI" Version="5.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Update="Forms\SyncGlobalCheckBox.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="NativeMethods.txt" />
-    <None Update="NOTICE.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <Target Condition="'$(PublishSingleFile)' == 'true'" AfterTargets="_ComputeFilesToBundle" Name="RemoveDupeAssemblies">
-    <ItemGroup>
-      <_FilesToBundle Remove="$(PkgMicrosoft_Diagnostics_Tracing_TraceEvent)\build\native\x86\**" />
-    </ItemGroup>
-  </Target>
-
-</Project>
--- a/Netch/Netch.csproj
+++ b/Netch/Netch.csproj
@@ -41,14 +41,14 @@
    <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1">
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="Fody" Version="6.6.0">
+    <PackageReference Include="Fody" Version="6.6.2">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="HMBSbige.SingleInstance" Version="6.0.0" />
    <PackageReference Include="MaxMind.GeoIP2" Version="5.1.0" />
-    <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.76" GeneratePathProperty="true" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.1.46" />
+    <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.0.1" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.2.32" />
    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.588-beta">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -57,12 +57,12 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Serilog" Version="2.11.0" />
    <PackageReference Include="Serilog.Extensions.Hosting" Version="4.2.0" />
    <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
-    <PackageReference Include="Stun.Net" Version="6.0.0" />
+    <PackageReference Include="Stun.Net" Version="6.2.0" />
    <PackageReference Include="System.Management" Version="6.0.0" />
    <PackageReference Include="TaskScheduler" Version="2.10.1" />
    <PackageReference Include="WindowsFirewallHelper" Version="2.2.0.86" />
--- a/Netch/Properties/Resources.Designer.cs
+++ b/Netch/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Netch.Properties {
    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
    // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
@@ -130,16 +130,6 @@ namespace Netch.Properties {
            }
        }
        
-        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
-        /// </summary>
-        internal static System.Drawing.Bitmap Sponsor {
-            get {
-                object obj = ResourceManager.GetObject("Sponsor", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
        /// <summary>
        ///   查找 System.Byte[] 类型的本地化资源。
        /// </summary>
--- a/Netch/Properties/Resources.resx
+++ b/Netch/Properties/Resources.resx
@@ -138,10 +138,6 @@
    <value>..\Resources\Netch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="Sponsor" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Sponsor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="CopyLink" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\CopyLink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
--- a/Netch/Resources/Sponsor.png
+++ b/Netch/Resources/Sponsor.png
--- a/Netch/Resources/zh-CN
+++ b/Netch/Resources/zh-CN
@@ -69,6 +69,10 @@
    "Plugin": "插件",
    "Plugin Options": "插件参数",
    "Remote Address": "远端地址",
+    "Local Addresses": "本地地址(可多个)",
+    "Public Key": "节点公钥",
+    "Private Key": "私钥",
+    "PSK": "节点预共享密钥",

    "Subscription": "订阅",
    "Manage Subscriptions": "管理订阅",
--- a/Netch/Servers/Shadowsocks/ShadowsocksServer.cs
+++ b/Netch/Servers/Shadowsocks/ShadowsocksServer.cs
@@ -13,7 +13,7 @@ public class ShadowsocksServer : Server
    /// <summary>
    ///     加密方式
    /// </summary>
-    public string EncryptMethod { get; set; } = SSGlobal.EncryptMethods[0];
+    public string EncryptMethod { get; set; } = SSGlobal.EncryptMethods[4];

    /// <summary>
    ///     密码
@@ -43,24 +43,50 @@ public static class SSGlobal
    /// </summary>
    public static readonly List<string> EncryptMethods = new()
    {
-        "rc4-md5",
+        "none",
+
+        // 2022 edition cipher
+        "2022-blake3-aes-128-gcm",
+        "2022-blake3-aes-256-gcm",
+        "2022-blake3-chacha20-poly1305",
+
+        // AEAD cipher
        "aes-128-gcm",
        "aes-192-gcm",
        "aes-256-gcm",
-        "aes-128-cfb",
-        "aes-192-cfb",
-        "aes-256-cfb",
+        "chacha20-ietf-poly1305",
+        "xchacha20-ietf-poly1305",
+
+        // stream cipher
+        "rc4",
+        "rc4-md5",
        "aes-128-ctr",
        "aes-192-ctr",
        "aes-256-ctr",
+        "aes-128-cfb",
+        "aes-192-cfb",
+        "aes-256-cfb",
+        "aes-128-cfb8",
+        "aes-192-cfb8",
+        "aes-256-cfb8",
+        "aes-128-ofb",
+        "aes-192-ofb",
+        "aes-256-ofb",
+        "bf-cfb",
+        "cast5-cfb",
+        "des-cfb",
+        "idea-cfb",
+        "rc2-cfb",
+        "seed-cfb",
        "camellia-128-cfb",
        "camellia-192-cfb",
        "camellia-256-cfb",
-        "bf-cfb",
-        "chacha20-ietf-poly1305",
-        "xchacha20-ietf-poly1305",
+        "camellia-128-cfb8",
+        "camellia-192-cfb8",
+        "camellia-256-cfb8",
        "salsa20",
        "chacha20",
-        "chacha20-ietf"
+        "chacha20-ietf",
+        "xchacha20"
    };
 }
--- a/Netch/Servers/Shadowsocks/ShadowsocksUtil.cs
+++ b/Netch/Servers/Shadowsocks/ShadowsocksUtil.cs
@@ -114,13 +114,13 @@ public class ShadowsocksUtil : IServerUtil
                {
                    case "obfs-local":
                    case "simple-obfs":
-                        plugin = "simple-obfs";
+                        plugin = "obfs-local";
                        if (!pluginopts.Contains("obfs="))
                            pluginopts = "obfs=http;obfs-host=" + pluginopts;

                        break;
                    case "simple-obfs-tls":
-                        plugin = "simple-obfs";
+                        plugin = "obfs-local";
                        if (!pluginopts.Contains("obfs="))
                            pluginopts = "obfs=tls;obfs-host=" + pluginopts;

--- a/Netch/Servers/ShadowsocksR/ShadowsocksRServer.cs
+++ b/Netch/Servers/ShadowsocksR/ShadowsocksRServer.cs
@@ -18,7 +18,7 @@ public class ShadowsocksRServer : Server
    /// <summary>
    ///     加密方式
    /// </summary>
-    public string EncryptMethod { get; set; } = SSRGlobal.EncryptMethods[0];
+    public string EncryptMethod { get; set; } = SSRGlobal.EncryptMethods[4];

    /// <summary>
    ///     协议
@@ -49,11 +49,11 @@ public class SSRGlobal
    public static readonly List<string> Protocols = new()
    {
        "origin",
-        "verify_deflate",
        "auth_sha1_v4",
        "auth_aes128_md5",
        "auth_aes128_sha1",
-        "auth_chain_a"
+        "auth_chain_a",
+        "auth_chain_b"
    };

    /// <summary>
@@ -64,36 +64,14 @@ public class SSRGlobal
        "plain",
        "http_simple",
        "http_post",
-        "tls1.2_ticket_auth"
+        "tls_simple",
+        "tls1.2_ticket_auth",
+        "tls1.2_ticket_fastauth",
+        "random_head"
    };

    /// <summary>
    ///     SS/SSR 加密方式
    /// </summary>
-    public static readonly List<string> EncryptMethods = new()
-    {
-        "none",
-        "table",
-        "rc4",
-        "rc4-md5",
-        "rc4-md5-6",
-        "aes-128-cfb",
-        "aes-192-cfb",
-        "aes-256-cfb",
-        "aes-128-ctr",
-        "aes-192-ctr",
-        "aes-256-ctr",
-        "bf-cfb",
-        "camellia-128-cfb",
-        "camellia-192-cfb",
-        "camellia-256-cfb",
-        "cast5-cfb",
-        "des-cfb",
-        "idea-cfb",
-        "rc2-cfb",
-        "seed-cfb",
-        "salsa20",
-        "chacha20",
-        "chacha20-ietf"
-    };
+    public static readonly List<string> EncryptMethods = SSGlobal.EncryptMethods;
 }
--- a/Netch/Servers/Trojan/TrojanForm.cs
+++ b/Netch/Servers/Trojan/TrojanForm.cs
@@ -11,6 +11,7 @@ public class TrojanForm : ServerForm
        Server = server;
        CreateTextBox("Password", "Password", s => true, s => server.Password = s, server.Password);
        CreateTextBox("Host", "Host", s => true, s => server.Host = s, server.Host);
+        CreateComboBox("TLSSecure", "TLS Secure", VLESSGlobal.TLSSecure, s => server.TLSSecureType = s, server.TLSSecureType);
    }

    protected override string TypeName { get; } = "Trojan";
--- a/Netch/Servers/Trojan/TrojanServer.cs
+++ b/Netch/Servers/Trojan/TrojanServer.cs
@@ -4,6 +4,8 @@ namespace Netch.Servers;

 public class TrojanServer : Server
 {
+    private string _tlsSecureType = VLESSGlobal.TLSSecure[1];
+
    public override string Type { get; } = "Trojan";

    public override string MaskedData()
@@ -20,4 +22,19 @@ public class TrojanServer : Server
    ///     伪装域名
    /// </summary>
    public string? Host { get; set; }
+
+    /// <summary>
+    ///     TLS 底层传输安全
+    /// </summary>
+    public string TLSSecureType
+    {
+        get => _tlsSecureType;
+        set
+        {
+            if (value == "")
+                value = VLESSGlobal.TLSSecure[1];
+
+            _tlsSecureType = value;
+        }
+    }
 }
--- a/Netch/Servers/Trojan/TrojanUtil.cs
+++ b/Netch/Servers/Trojan/TrojanUtil.cs
@@ -32,7 +32,7 @@ public class TrojanUtil : IServerUtil
    public string GetShareLink(Server s)
    {
        var server = (TrojanServer)s;
-        return $"trojan://{HttpUtility.UrlEncode(server.Password)}@{server.Hostname}:{server.Port}#{server.Remark}";
+        return $"trojan://{HttpUtility.UrlEncode(server.Password)}@{server.Hostname}:{server.Port}?sni={server.Host}#{server.Remark}";
    }

    public IServerController GetController()
@@ -61,8 +61,13 @@ public class TrojanUtil : IServerUtil

            var peer = HttpUtility.UrlDecode(HttpUtility.ParseQueryString(new Uri(text).Query).Get("peer"));

-            if (peer != null)
+            if (peer != null) {
                data.Host = peer;
+            } else {
+                peer = HttpUtility.UrlDecode(HttpUtility.ParseQueryString(new Uri(text).Query).Get("sni"));
+                if (peer != null)
+                    data.Host = peer;
+            }

            text = regmatch.Groups["data"].Value;
        }
--- a/Netch/Servers/V2ray/V2rayConfig.cs
+++ b/Netch/Servers/V2ray/V2rayConfig.cs
@@ -29,9 +29,9 @@ public class Outbound

    public OutboundConfiguration settings { get; set; }

-    public StreamSettings streamSettings { get; set; }
+    public StreamSettings? streamSettings { get; set; }

-    public Mux mux { get; set; }
+    public Mux? mux { get; set; }
 }

 public class OutboundConfiguration
@@ -39,6 +39,28 @@ public class OutboundConfiguration
    public VnextItem[] vnext { get; set; }

    public object[] servers { get; set; }
+
+    public string address { get; set; }
+
+    public ushort port { get; set; }
+
+    public string packetEncoding { get; set; }
+
+    public string plugin { get; set; }
+
+    public string pluginOpts { get; set; }
+
+    public string[] pluginArgs { get; set; }
+
+    public string[] localAddresses { get; set; }
+
+    public string peerPublicKey { get; set; }
+
+    public string privateKey { get; set; }
+
+    public string preSharedKey { get; set; }
+
+    public int mtu { get; set; }
 }

 public class VnextItem
@@ -50,10 +72,23 @@ public class VnextItem
    public User[] users { get; set; }
 }

+public class ShadowsocksServerItem
+{
+    public string address { get; set; }
+    
+    public ushort port { get; set; }
+
+    public string method { get; set; }
+
+    public string password { get; set; }
+ }
+
 public class Mux
 {
    public bool enabled { get; set; }

+    public string packetEncoding { get; set; }
+
    public int concurrency { get; set; }
 }

--- a/Netch/Servers/V2ray/V2rayConfigUtils.cs
+++ b/Netch/Servers/V2ray/V2rayConfigUtils.cs
@@ -20,6 +20,7 @@ public static class V2rayConfigUtils
                    listen = Global.Settings.LocalAddress,
                    settings = new
                    {
+                        auth = "noauth",
                        udp = true
                    }
                }
@@ -89,6 +90,9 @@ public static class V2rayConfigUtils
                    }
                };

+                outbound.settings.packetEncoding = Global.Settings.V2RayConfig.XrayCone ? vless.PacketEncoding : "none";
+                outbound.mux.packetEncoding = Global.Settings.V2RayConfig.XrayCone ? vless.PacketEncoding : "none";
+
                outbound.streamSettings = boundStreamSettings(vless);

                if (vless.TLSSecureType == "xtls")
@@ -107,6 +111,10 @@ public static class V2rayConfigUtils
            case VMessServer vmess:
            {
                outbound.protocol = "vmess";
+                if (vmess.EncryptMethod == "auto" && vmess.TLSSecureType != "none" && !Global.Settings.V2RayConfig.AllowInsecure)
+                {
+                    vmess.EncryptMethod = "zero";
+                }
                outbound.settings.vnext = new[]
                {
                    new VnextItem
@@ -125,12 +133,111 @@ public static class V2rayConfigUtils
                    }
                };

+                outbound.settings.packetEncoding = Global.Settings.V2RayConfig.XrayCone ? vmess.PacketEncoding : "none";
+                outbound.mux.packetEncoding = Global.Settings.V2RayConfig.XrayCone ? vmess.PacketEncoding : "none";
+
                outbound.streamSettings = boundStreamSettings(vmess);

                outbound.mux.enabled = vmess.UseMux ?? Global.Settings.V2RayConfig.UseMux;
                outbound.mux.concurrency = vmess.UseMux ?? Global.Settings.V2RayConfig.UseMux ? 8 : -1;
                break;
            }
+            case ShadowsocksServer ss:
+                outbound.protocol = "shadowsocks";
+                outbound.settings = new OutboundConfiguration
+                {
+                    servers = new[]
+                    {
+                        new ShadowsocksServerItem
+                        {
+                            address = await server.AutoResolveHostnameAsync(),
+                            port = server.Port,
+                            method = ss.EncryptMethod,
+                            password = ss.Password,
+                        }
+                    },
+                    plugin = ss.Plugin ?? "",
+                    pluginOpts = ss.PluginOption ?? ""
+                };
+                break;
+             case ShadowsocksRServer ssr:
+                outbound.protocol = "shadowsocks";
+                outbound.settings = new OutboundConfiguration
+                {
+                    servers = new[]
+                    {
+                        new ShadowsocksServerItem
+                        {
+                            address = await server.AutoResolveHostnameAsync(),
+                            port = server.Port,
+                            method = ssr.EncryptMethod,
+                            password = ssr.Password,
+                        }
+                    },
+                    plugin = "shadowsocksr",
+                    pluginArgs = new string[]
+                    {
+                        "--obfs=" + ssr.OBFS,
+                        "--obfs-param=" + ssr.OBFSParam ?? "",
+                        "--protocol=" + ssr.Protocol,
+                        "--protocol-param=" + ssr.ProtocolParam ?? ""
+                    }
+                };
+                break;
+             case TrojanServer trojan:
+                outbound.protocol = "trojan";
+                outbound.settings = new OutboundConfiguration
+                {
+                    servers = new[]
+                    {
+                            new ShadowsocksServerItem // I'm not serious
+                            {
+                                address = await server.AutoResolveHostnameAsync(),
+                                port = server.Port,
+                                method = "",
+                                password = trojan.Password
+                            }
+                    }
+                };
+
+                outbound.streamSettings = new StreamSettings
+                {
+                    network = "tcp",
+                    security = trojan.TLSSecureType
+                };
+                if (trojan.TLSSecureType != "none")
+                {
+                    var tlsSettings = new TlsSettings
+                    {
+                        allowInsecure = Global.Settings.V2RayConfig.AllowInsecure,
+                        serverName = trojan.Host ?? ""
+                    };
+
+                    switch (trojan.TLSSecureType)
+                    {
+                        case "tls":
+                            outbound.streamSettings.tlsSettings = tlsSettings;
+                            break;
+                        case "xtls":
+                            outbound.streamSettings.xtlsSettings = tlsSettings;
+                            break;
+                    }
+                }
+                break;
+            case WireGuardServer wg:
+                outbound.protocol = "wireguard";
+                outbound.settings = new OutboundConfiguration
+                {
+                    address = await server.AutoResolveHostnameAsync(),
+                    port = server.Port,
+                    localAddresses = wg.LocalAddresses.SplitOrDefault(),
+                    peerPublicKey = wg.PeerPublicKey,
+                    privateKey = wg.PrivateKey,
+                    preSharedKey = wg.PreSharedKey,
+                    mtu = wg.MTU
+                };
+                break;
+
        }

        return outbound;
--- a/Netch/Servers/V2ray/V2rayController.cs
+++ b/Netch/Servers/V2ray/V2rayController.cs
@@ -8,17 +8,17 @@ namespace Netch.Servers;

 public class V2rayController : Guard, IServerController
 {
-    public V2rayController() : base("xray.exe")
+    public V2rayController() : base("v2ray-sn.exe")
    {
-        if (!Global.Settings.V2RayConfig.XrayCone)
-            Instance.StartInfo.Environment["XRAY_CONE_DISABLED"] = "true";
+        //if (!Global.Settings.V2RayConfig.XrayCone)
+        //    Instance.StartInfo.Environment["XRAY_CONE_DISABLED"] = "true";
    }

    protected override IEnumerable<string> StartedKeywords => new[] { "started" };

    protected override IEnumerable<string> FailedKeywords => new[] { "config file not readable", "failed to" };

-    public override string Name => "Xray";
+    public override string Name => "V2Ray (SagerNet)";

    public ushort? Socks5LocalPort { get; set; }

@@ -31,7 +31,7 @@ public class V2rayController : Guard, IServerController
            await JsonSerializer.SerializeAsync(fileStream, await V2rayConfigUtils.GenerateClientConfigAsync(s), Global.NewCustomJsonSerializerOptions());
        }

-        await StartGuardAsync("-config ..\\data\\last.json");
+        await StartGuardAsync("run -c ..\\data\\last.json");
        return new Socks5Server(IPAddress.Loopback.ToString(), this.Socks5LocalPort(), s.Hostname);
    }
 }
--- a/Netch/Servers/V2ray/V2rayUtils.cs
+++ b/Netch/Servers/V2ray/V2rayUtils.cs
@@ -22,6 +22,7 @@ public static class V2rayUtils
            var parameter = HttpUtility.ParseQueryString(text.Split('?')[1]);
            text = text.Substring(0, text.IndexOf("?", StringComparison.Ordinal));
            server.TransferProtocol = parameter.Get("type") ?? "tcp";
+            server.PacketEncoding = parameter.Get("packetEncoding") ?? "xudp";
            server.EncryptMethod = parameter.Get("encryption") ?? scheme switch { "vless" => "none", _ => "auto" };
            switch (server.TransferProtocol)
            {
@@ -55,7 +56,7 @@ public static class V2rayUtils
            {
                server.ServerName = parameter.Get("sni") ?? "";
                if (server.TLSSecureType == "xtls")
-                    ((VLESSServer)server).Flow = parameter.Get("flow") ?? "";
+                    ((VLESSServer)server).Flow = "xtls-rprx-direct"; // splice doesn't support Windows
            }
        }

@@ -79,6 +80,7 @@ public static class V2rayUtils
        // protocol-specific fields
        parameter.Add("type", server.TransferProtocol);
        parameter.Add("encryption", server.EncryptMethod);
+        parameter.Add("packetEncoding", server.PacketEncoding);

        // transport-specific fields
        switch (server.TransferProtocol)
--- a/Netch/Servers/VLESS/VLESSForm.cs
+++ b/Netch/Servers/VLESS/VLESSForm.cs
@@ -23,6 +23,11 @@ internal class VLESSForm : ServerForm
            VLESSGlobal.TransferProtocols,
            s => server.TransferProtocol = s,
            server.TransferProtocol);
+        CreateComboBox("PacketEncoding",
+            "Packet Encoding",
+            VMessGlobal.PacketEncodings,
+            s => server.PacketEncoding = s,
+            server.PacketEncoding);

        CreateComboBox("FakeType", "Fake Type", VLESSGlobal.FakeTypes, s => server.FakeType = s, server.FakeType);
        CreateTextBox("Host", "Host", s => true, s => server.Host = s, server.Host);
--- a/Netch/Servers/VLESS/VLESSServer.cs
+++ b/Netch/Servers/VLESS/VLESSServer.cs
@@ -21,7 +21,7 @@ public class VLESSServer : VMessServer

    /// <summary>
    /// </summary>
-    public string? Flow { get; set; }
+    public string? Flow { get; set; } = "xtls-rprx-direct";
 }

 public class VLESSGlobal
--- a/Netch/Servers/VMess/VMessForm.cs
+++ b/Netch/Servers/VMess/VMessForm.cs
@@ -18,6 +18,12 @@ public class VMessForm : ServerForm
            VMessGlobal.TransferProtocols,
            s => server.TransferProtocol = s,
            server.TransferProtocol);
+        CreateComboBox("PacketEncoding",
+            "Packet Encoding",
+            VMessGlobal.PacketEncodings,
+            s => server.PacketEncoding = s,
+            server.PacketEncoding);
+        

        CreateComboBox("FakeType", "Fake Type", VMessGlobal.FakeTypes, s => server.FakeType = s, server.FakeType);
        CreateTextBox("Host", "Host", s => true, s => server.Host = s, server.Host);
--- a/Netch/Servers/VMess/VMessServer.cs
+++ b/Netch/Servers/VMess/VMessServer.cs
@@ -10,7 +10,7 @@ public class VMessServer : Server

    public override string MaskedData()
    {
-        var maskedData = $"{EncryptMethod} + {TransferProtocol} + {FakeType}";
+        var maskedData = $"{EncryptMethod} + {TransferProtocol} + {PacketEncoding} + {FakeType}";
        switch (TransferProtocol)
        {
            case "tcp":
@@ -49,6 +49,11 @@ public class VMessServer : Server
    /// </summary>
    public virtual string TransferProtocol { get; set; } = VMessGlobal.TransferProtocols[0];

+    /// <summary>
+    ///     包传输格式
+    /// </summary>
+    public virtual string PacketEncoding { get; set; } = VMessGlobal.PacketEncodings[2];
+
    /// <summary>
    ///     伪装类型
    /// </summary>
@@ -104,7 +109,8 @@ public class VMessGlobal
        "auto",
        "none",
        "aes-128-gcm",
-        "chacha20-poly1305"
+        "chacha20-poly1305",
+        "zero"
    };

    public static readonly List<string> QUIC = new()
@@ -114,6 +120,13 @@ public class VMessGlobal
        "chacha20-poly1305"
    };

+    public static readonly List<string> PacketEncodings = new()
+    {
+        "none",
+        "packet", // requires v2fly/v2ray-core v5.0.2+ or SagerNet/v2ray-core
+        "xudp" // requires XTLS/Xray-core or SagerNet/v2ray-core
+    };
+
    /// <summary>
    ///     V2Ray 传输协议
    /// </summary>
--- a/Netch/Servers/WireGuard/WireGuardForm.cs
+++ b/Netch/Servers/WireGuard/WireGuardForm.cs
@@ -0,0 +1,20 @@
+using Netch.Forms;
+
+namespace Netch.Servers;
+
+[Fody.ConfigureAwait(true)]
+public class WireGuardForm : ServerForm
+{
+    public WireGuardForm(WireGuardServer? server = default)
+    {
+        server ??= new WireGuardServer();
+        Server = server;
+        CreateTextBox("LocalAddresses", "Local Addresses", s => true, s => server.LocalAddresses = s, server.LocalAddresses);
+        CreateTextBox("PeerPublicKey", "Public Key", s => true, s => server.PeerPublicKey = s, server.PeerPublicKey);
+        CreateTextBox("PrivateKey", "Private Key", s => true, s => server.PrivateKey = s, server.PrivateKey);
+        CreateTextBox("PreSharedKey", "PSK", s => true, s => server.PreSharedKey = s, server.PreSharedKey);
+        CreateTextBox("MTU", "MTU", s => int.TryParse(s, out _), s => server.MTU = int.Parse(s), server.MTU.ToString(), 76);
+    }
+
+    protected override string TypeName { get; } = "WireGuard";
+}
--- a/Netch/Servers/WireGuard/WireGuardServer.cs
+++ b/Netch/Servers/WireGuard/WireGuardServer.cs
@@ -0,0 +1,38 @@
+using Netch.Models;
+
+namespace Netch.Servers;
+
+public class WireGuardServer : Server
+{
+    public override string Type { get; } = "WireGuard";
+    
+    public override string MaskedData()
+    {
+        return $"{LocalAddresses} + {MTU}";
+    }
+
+    /// <summary>
+    ///     本地地址
+    /// </summary>
+    public string LocalAddresses { get; set; } = "172.16.0.2";
+
+    /// <summary>
+    ///     节点公钥
+    /// </summary>
+    public string PeerPublicKey { get; set; } = string.Empty;
+
+    /// <summary>
+    ///     私钥
+    /// </summary>
+    public string PrivateKey { get; set; }
+
+    /// <summary>
+    ///     节点预共享密钥
+    /// </summary>
+    public string? PreSharedKey { get; set; }
+
+    /// <summary>
+    ///     MTU
+    /// </summary>
+    public int MTU { get; set; } = 1420;
+}
--- a/Netch/Servers/WireGuard/WireGuardUtil.cs
+++ b/Netch/Servers/WireGuard/WireGuardUtil.cs
@@ -0,0 +1,53 @@
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Netch.Interfaces;
+using Netch.Models;
+using Netch.Utils;
+
+namespace Netch.Servers;
+
+public class WireGuardUtil : IServerUtil
+{
+    public ushort Priority { get; } = 4;
+
+    public string TypeName { get; } = "WireGuard";
+
+    public string FullName { get; } = "WireGuard";
+
+    public string ShortName { get; } = "WG";
+
+    public string[] UriScheme { get; } = { "wireguard" };
+
+    public Type ServerType { get; } = typeof(WireGuardServer);
+
+    public void Edit(Server s)
+    {
+        new WireGuardForm((WireGuardServer)s).ShowDialog();
+    }
+
+    public void Create()
+    {
+        new WireGuardForm().ShowDialog();
+    }
+
+    public string GetShareLink(Server s)
+    {
+        return V2rayUtils.GetVShareLink(s, "wireguard");
+    }
+
+    public IServerController GetController()
+    {
+        return new V2rayController();
+    }
+
+    public IEnumerable<Server> ParseUri(string text)
+    {
+        return V2rayUtils.ParseVUri(text);
+    }
+
+    public bool CheckServer(Server s)
+    {
+        return true;
+    }
+}
--- a/Other/libev-mingw/build.ps1
+++ b/Other/libev-mingw/build.ps1
@@ -1,10 +0,0 @@
-Set-Location (Split-Path $MyInvocation.MyCommand.Path -Parent)
-
-git clone https://github.com/shadowsocks/libev -b 'mingw' src
-if ( -Not $? ) {
-    exit $lastExitCode
-}
-Set-Location src
-
-msys2 ..\build.sh
-exit $lastExitCode
--- a/Other/libev-mingw/build.sh
+++ b/Other/libev-mingw/build.sh
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-mkdir -p "${PWD}/../../build"
-
-./configure --prefix="${PWD}/../../build" || exit $?
-
-make install -j2
-exit $?
--- a/Other/shadowsocks-rust/build.ps1
+++ b/Other/shadowsocks-rust/build.ps1
@@ -1,15 +0,0 @@
-Set-Location (Split-Path $MyInvocation.MyCommand.Path -Parent)
-
-git clone https://github.com/shadowsocks/shadowsocks-rust -b 'v1.12.0' src
-if ( -Not $? ) {
-    exit $lastExitCode
-}
-Set-Location src
-
-cargo build --features logging,trust-dns,local,utility,local-http,local-tunnel,local-socks4,multi-threaded,stream-cipher --release
-if ( -Not $? ) {
-    exit $lastExitCode
-}
-
-cp -Force '.\target\release\sslocal.exe' '..\..\release\Shadowsocks.exe'
-exit 0
--- a/Other/shadowsocksr-libev/build.ps1
+++ b/Other/shadowsocksr-libev/build.ps1
@@ -1,15 +0,0 @@
-Set-Location (Split-Path $MyInvocation.MyCommand.Path -Parent)
-
-git clone https://github.com/shadowsocksrr/shadowsocksr-libev -b 'Akkariiin/develop' src
-if ( -Not $? ) {
-    exit $lastExitCode
-}
-Set-Location src
-
-msys2 ..\build.sh
-if ( -Not $? ) {
-    exit $lastExitCode
-}
-
-cp -Force '.\ss-local.exe' '..\..\release\ShadowsocksR.exe'
-exit 0
--- a/Other/shadowsocksr-libev/build.sh
+++ b/Other/shadowsocksr-libev/build.sh
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-git submodule update --init || exit $?
-
-cd libudns
-./autogen.sh || exit $?
-./configure || exit $?
-make -j2 || exit $?
-cd ..
-
-./autogen.sh || exit $?
-CFLAGS+="-fstack-protector" ./configure --disable-documentation --with-ev="${PWD}/../../build" || exit $?
-
-sed -i "s/%I/%z/g" src/utils.h
-sed -i "s/^const/extern const/g" src/tls.h
-sed -i "s/^const/extern const/g" src/http.h
-
-make -j2 || exit $?
-
-gcc $(find src/ -name "ss_local-*.o") $(find . -name "*.a" ! -name "*.dll.a") "${PWD}/../../build/lib/libev.a" -o ss-local -fstack-protector -static -lpcre -lssl -lcrypto -lws2_32 -s
-exit $?
--- a/Other/simple-obfs/build.ps1
+++ b/Other/simple-obfs/build.ps1
@@ -1,15 +0,0 @@
-Set-Location (Split-Path $MyInvocation.MyCommand.Path -Parent)
-
-git clone https://github.com/shadowsocks/simple-obfs src
-if ( -Not $? ) {
-    exit $lastExitCode
-}
-Set-Location src
-
-msys2 ..\build.sh
-if ( -Not $? ) {
-    exit $lastExitCode
-}
-
-cp -Force '.\obfs-local.exe' '..\..\release\simple-obfs.exe'
-exit 0
--- a/Other/simple-obfs/build.sh
+++ b/Other/simple-obfs/build.sh
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-git submodule update --init || exit $?
-
-./autogen.sh || exit $?
-./configure --disable-documentation --with-ev="${PWD}/../../build" || exit $?
-
-make -j2 || exit $?
-
-gcc $(find src/ -name "obfs_local-*.o") $(find . -name "*.a" ! -name "*.dll.a") "${PWD}/../../build/lib/libev.a" -o obfs-local -fstack-protector -static -lws2_32 -s
-exit $?
--- a/Other/trojan-go/build.ps1
+++ b/Other/trojan-go/build.ps1
@@ -1,15 +0,0 @@
-Set-Location (Split-Path $MyInvocation.MyCommand.Path -Parent)
-
-git clone https://github.com/p4gefau1t/trojan-go -b 'v0.10.6' src
-if ( -Not $? ) {
-    exit $lastExitCode
-}
-Set-Location src
-
-$Env:CGO_ENABLED='0'
-$Env:GOROOT_FINAL='/usr'
-
-$Env:GOOS='windows'
-$Env:GOARCH='amd64'
-go build -a -trimpath -asmflags '-s -w' -ldflags '-s -w' -tags 'full' -o '..\..\release\Trojan.exe'
-exit $lastExitCode
--- a/Other/v2ray-sn/README.md
+++ b/Other/v2ray-sn/README.md
@@ -0,0 +1,56 @@
+# Project V for SagerNet for Netch
+This is not a joke.  
+Modified from [SagerNet/v2ray-core](https://github.com/SagerNet/v2ray-core).  
+#### Extends all features of SagerNet/v2ray-core
+
+### Changes
+
+- embed ShadowsocksR plugin for shadowsocks
+
+```json
+{
+  "outbounds": [
+    {
+      "protocol": "shadowsocks",
+      "settings": {
+        ...
+        "plugin": "shadowsocksr",
+        "pluginArgs": [
+          "--obfs=<OBFS_TYPE>",
+          "--obfs-param=<OBFS_PARAMETERS>",
+          "--protocol=<PROTOCOL_TYPE>",
+          "--protocol-param=<PROTOCOL_PARAMETERS>"
+        ]
+      }
+    }
+  ]
+}
+```
+
+- embed simple-obfs plugin for shadowsocks
+
+```json
+{
+  "outbounds": [
+    {
+      "protocol": "shadowsocks",
+      "settings": {
+        ...
+        "plugin": "obfs-local",
+        "pluginOpts": "<SIMPLE_OBFS_OPTIONS>"
+      }
+    }
+  ]
+}
+```
+
+- Re-enable ReadV
+
+### License
+
+GPL v3
+
+### Credits
+
+This repo relies on the following projects:  
+- [SagerNet/LibSagerNetCore](https://github.com/SagerNet/LibSagerNetCore)
--- a/Other/v2ray-sn/build.ps1
+++ b/Other/v2ray-sn/build.ps1
@@ -0,0 +1,28 @@
+Set-Location (Split-Path $MyInvocation.MyCommand.Path -Parent)
+
+git clone https://github.com/SagerNet/v2ray-core.git -b 'v5.0.14' src
+if ( -Not $? ) {
+    exit $lastExitCode
+}
+Set-Location src
+
+# Download SSR plugin
+Invoke-WebRequest -Uri 'https://gist.githubusercontent.com/H1JK/b3165a99b635dcc06101690e4c43b5fd/raw/691b471f3b395a949d03a3d064d93d319d4997b7/ssr.go' -OutFile '.\proxy\shadowsocks\plugin\self\ssr.go'
+
+# Download Simple-Obfs plugin
+Invoke-WebRequest -Uri 'https://gist.githubusercontent.com/H1JK/b3165a99b635dcc06101690e4c43b5fd/raw/691b471f3b395a949d03a3d064d93d319d4997b7/obfs.go' -OutFile '.\proxy\shadowsocks\plugin\self\obfs.go'
+
+# Enable ReadV (Use old ReadV code)
+Remove-Item '.\common\buf\io.go'
+Remove-Item '.\common\buf\readv_reader.go'
+Invoke-WebRequest -Uri 'https://raw.githubusercontent.com/SagerNet/v2ray-core/2711fd1/common/buf/io.go' -OutFile '.\common\buf\io.go'
+Invoke-WebRequest -Uri 'https://raw.githubusercontent.com/SagerNet/v2ray-core/2711fd1/common/buf/readv_reader.go' -OutFile '.\common\buf\readv_reader.go'
+
+$Env:CGO_ENABLED='0'
+$Env:GOROOT_FINAL='/usr'
+
+$Env:GOOS='windows'
+$Env:GOARCH='amd64'
+go mod tidy # necessary
+go build -a -trimpath -asmflags '-s -w' -ldflags '-s -w -buildid=' -o '..\..\release\v2ray-sn.exe' '.\main'
+exit $lastExitCode
--- a/Other/xray-core/build.ps1
+++ b/Other/xray-core/build.ps1
@@ -1,15 +0,0 @@
-Set-Location (Split-Path $MyInvocation.MyCommand.Path -Parent)
-
-git clone https://github.com/xtls/xray-core -b 'v1.4.5' src
-if ( -Not $? ) {
-    exit $lastExitCode
-}
-Set-Location src
-
-$Env:CGO_ENABLED='0'
-$Env:GOROOT_FINAL='/usr'
-
-$Env:GOOS='windows'
-$Env:GOARCH='amd64'
-go build -a -trimpath -asmflags '-s -w' -ldflags '-s -w -buildid=' -o '..\..\release\xray.exe' '.\main'
-exit $lastExitCode
--- a/Other/xray-plugin/build.ps1
+++ b/Other/xray-plugin/build.ps1
@@ -1,15 +0,0 @@
-Set-Location (Split-Path $MyInvocation.MyCommand.Path -Parent)
-
-git clone https://github.com/teddysun/xray-plugin -b 'v1.4.5' src
-if ( -Not $? ) {
-    exit $lastExitCode
-}
-Set-Location src
-
-$Env:CGO_ENABLED='0'
-$Env:GOROOT_FINAL='/usr'
-
-$Env:GOOS='windows'
-$Env:GOARCH='amd64'
-go build -a -trimpath -asmflags '-s -w' -ldflags '-s -w' -o '..\..\release\xray-plugin.exe'
-exit $lastExitCode
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Some features may not be implemented in version 1
 - [`WireGuard`](https://www.wireguard.com)
 - [`Trojan`](https://trojan-gfw.github.io/trojan)
 - [`VMess`](https://www.v2fly.org)
- [`VLess`](https://xtls.github.io)
+- [`VLESS`](https://xtls.github.io)

 ### Others
 - UDP NAT FullCone (Limited by your server)
--- a/Storage/GeoLite2-Country.mmdb
+++ b/Storage/GeoLite2-Country.mmdb
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -9,9 +9,9 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
    <PackageReference Include="coverlet.collector" Version="3.1.2" />
  </ItemGroup>

--- a/build.ps1
+++ b/build.ps1
@@ -36,7 +36,8 @@ cp -Recurse -Force '..\Storage\mode' '.'  | Out-Null
 cp -Recurse -Force '..\Storage\stun.txt' 'bin'  | Out-Null
 cp -Recurse -Force '..\Storage\nfdriver.sys' 'bin'  | Out-Null
 cp -Recurse -Force '..\Storage\aiodns.conf' 'bin'  | Out-Null
-cp -Recurse -Force '..\Storage\GeoLite2-Country.mmdb' 'bin'  | Out-Null
+Invoke-WebRequest -Uri 'https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb' -OutFile 'bin\GeoLite2-Country.mmdb'
+#cp -Recurse -Force '..\Storage\GeoLite2-Country.mmdb' 'bin'  | Out-Null
 cp -Recurse -Force '..\Storage\tun2socks.bin' 'bin'  | Out-Null
 cp -Recurse -Force '..\Storage\README.md' 'bin'  | Out-Null
 Pop-Location
@@ -59,7 +60,7 @@ if ( -Not ( Test-Path ".\Netch\bin\$Configuration" ) ) {
 		-c $Configuration `
 		-r 'win-x64' `
 		-p:Platform='x64' `
-		-p:SelfContained=$SelfContained `
+		-p:SelfContained=$False `
 		-p:PublishTrimmed=$PublishReadyToRun `
 		-p:PublishSingleFile=$PublishSingleFile `
 		-p:PublishReadyToRun=$PublishReadyToRun `
Author	SHA1	Message	Date
NarukawaHime	406135b04b	Fix DNS issue in TUN mode (#824 )	2022-06-09 21:42:27 +08:00
AmazingDM	c55a5f6418	Merge pull request #823 from H1JK/patch-update Replace Xray-core with SagerNet/v2ray-core, with more protocol support	2022-06-09 20:59:28 +08:00
AmazingDM	56a1d0d4ce	Merge pull request #829 from netchx/dependabot/nuget/Serilog-2.11.0 Bump Serilog from 2.10.0 to 2.11.0	2022-06-09 20:52:37 +08:00
AmazingDM	a0157b0492	Merge pull request #830 from netchx/dependabot/nuget/Microsoft.VisualStudio.Threading-17.2.32 Bump Microsoft.VisualStudio.Threading from 17.1.46 to 17.2.32	2022-06-09 20:52:18 +08:00
AmazingDM	87fa016543	Merge pull request #831 from netchx/dependabot/nuget/Microsoft.NET.Test.Sdk-17.2.0 Bump Microsoft.NET.Test.Sdk from 17.1.0 to 17.2.0	2022-06-09 20:52:10 +08:00
Hellojack	860b70bfa6	Fix typo	2022-06-09 11:44:28 +08:00
Hellojack	32cfe02715	[Netch] Support WireGuard protocol	2022-06-09 11:40:10 +08:00
dependabot[bot]	8e0722b897	Bump Microsoft.NET.Test.Sdk from 17.1.0 to 17.2.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.1.0 to 17.2.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v17.1.0...v17.2.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-08 16:49:36 +00:00
dependabot[bot]	a5e750d614	Bump Microsoft.VisualStudio.Threading from 17.1.46 to 17.2.32 Bumps [Microsoft.VisualStudio.Threading](https://github.com/microsoft/vs-threading) from 17.1.46 to 17.2.32. - [Release notes](https://github.com/microsoft/vs-threading/releases) - [Commits](https://github.com/microsoft/vs-threading/compare/v17.1.46...v17.2.32) --- updated-dependencies: - dependency-name: Microsoft.VisualStudio.Threading dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-08 16:49:29 +00:00
dependabot[bot]	5758007506	Bump Serilog from 2.10.0 to 2.11.0 Bumps [Serilog](https://github.com/serilog/serilog) from 2.10.0 to 2.11.0. - [Release notes](https://github.com/serilog/serilog/releases) - [Changelog](https://github.com/serilog/serilog/blob/dev/CHANGES.md) - [Commits](https://github.com/serilog/serilog/compare/v2.10.0...v2.11.0) --- updated-dependencies: - dependency-name: Serilog dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-08 16:49:24 +00:00
Hellojack	46a5f2e190	VMess : Automatically choose zero for secure TLS connection	2022-06-08 18:01:49 +08:00
Hellojack	a1c0a7fcbd	Merge branch 'netchx:main' into patch-update	2022-06-08 16:59:16 +08:00
Hellojack	c1f3bd37ac	Hello netch	2022-06-08 16:58:59 +08:00
dependabot[bot]	0f59b5bfe2	Bump MSTest.TestAdapter from 2.2.8 to 2.2.10 (#822 ) Bumps [MSTest.TestAdapter](https://github.com/microsoft/testfx) from 2.2.8 to 2.2.10. - [Release notes](https://github.com/microsoft/testfx/releases) - [Commits](https://github.com/microsoft/testfx/compare/v2.2.8...v2.2.10) --- updated-dependencies: - dependency-name: MSTest.TestAdapter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-06-08 16:06:17 +08:00
dependabot[bot]	83a3381e72	Bump Fody from 6.6.0 to 6.6.2 (#821 ) Bumps [Fody](https://github.com/Fody/Fody) from 6.6.0 to 6.6.2. - [Release notes](https://github.com/Fody/Fody/releases) - [Commits](https://github.com/Fody/Fody/commits/6.6.2) --- updated-dependencies: - dependency-name: Fody dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-06-08 16:06:01 +08:00
dependabot[bot]	c959f60f4a	Bump MSTest.TestFramework from 2.2.8 to 2.2.10 (#820 ) Bumps [MSTest.TestFramework](https://github.com/microsoft/testfx) from 2.2.8 to 2.2.10. - [Release notes](https://github.com/microsoft/testfx/releases) - [Commits](https://github.com/microsoft/testfx/compare/v2.2.8...v2.2.10) --- updated-dependencies: - dependency-name: MSTest.TestFramework dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-06-08 16:05:52 +08:00
dependabot[bot]	2e721d8501	Bump Microsoft.Diagnostics.Tracing.TraceEvent from 2.0.76 to 3.0.1 (#819 ) Bumps [Microsoft.Diagnostics.Tracing.TraceEvent](https://github.com/Microsoft/perfview) from 2.0.76 to 3.0.1. - [Release notes](https://github.com/Microsoft/perfview/releases) - [Commits](https://github.com/Microsoft/perfview/compare/P2.0.76...v3.0.1) --- updated-dependencies: - dependency-name: Microsoft.Diagnostics.Tracing.TraceEvent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-06-08 16:05:44 +08:00
dependabot[bot]	7084d47198	Bump actions/setup-go from 2 to 3 (#818 ) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 2 to 3. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-06-08 16:05:35 +08:00
dependabot[bot]	ba43ddb7be	Bump Stun.Net from 6.0.0 to 6.2.0 (#817 ) Bumps [Stun.Net](https://github.com/HMBSbige/NatTypeTester) from 6.0.0 to 6.2.0. - [Release notes](https://github.com/HMBSbige/NatTypeTester/releases) - [Commits](https://github.com/HMBSbige/NatTypeTester/compare/6.0.0...6.2.0) --- updated-dependencies: - dependency-name: Stun.Net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-06-08 16:05:28 +08:00
dependabot[bot]	1f28e38a5a	Bump actions/upload-artifact from 2 to 3 (#816 ) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-06-08 16:05:11 +08:00
Hellojack	dcae72f4d3	Bump version to 1.9.6-Beta1	2022-06-08 15:44:43 +08:00
Hellojack	277ebaba1b	Update SN core to 5.0.14	2022-06-08 15:28:10 +08:00
Hellojack	026456e4a1	Create README for V2Ray SagerNet	2022-06-07 10:15:07 +00:00
Hellojack	3d764a8bce	Fix Simple-Obfs	2022-06-07 12:53:27 +08:00
Hellojack	9983ee95d6	fix	2022-06-07 09:29:43 +08:00
Hellojack	661e53d553	Clean build scripts	2022-06-07 09:15:10 +08:00
Hellojack	2a1b2bbffc	Trojan : Enable TLS as default	2022-06-07 09:05:57 +08:00
Hellojack	47e98dc359	FIx Trojan	2022-06-07 08:12:52 +08:00
Hellojack	d3b3759f48	wtf?	2022-06-06 22:30:58 +08:00
Hellojack	bfc5d9dafb	clean	2022-06-06 22:24:10 +08:00
H1JK	979b88de7c	V2RAY FOR ALL	2022-06-06 10:18:31 +00:00
H1JK	2af1a4bee0	Fix a stupid bug XD	2022-06-06 04:08:29 +00:00
H1JK	3260e7ce74	wtf	2022-06-03 09:42:16 +00:00
H1JK	db28da454b	Update Jsonv5 configuration	2022-06-03 06:57:00 +00:00
H1JK	b1d4911576	Fix V2RayController	2022-06-03 05:23:26 +00:00
H1JK	dcf83c0113	fix build	2022-06-03 03:36:29 +00:00
H1JK	c2393efd10	Replace Xray with SagerNet/v2ray-core	2022-06-03 02:28:25 +00:00
H1JK	1fe1fda285	Add PacketEncoding parameter	2022-06-03 00:42:46 +00:00
H1JK	8f44125856	Temporarily disable SelfContain	2022-06-03 00:22:05 +00:00
layou233	876b18f85e	[GitHub CI] Bump Go version to 1.18.3	2022-06-02 10:29:02 +00:00
layou233	740f707a30	Always use direct	2022-06-02 10:16:06 +00:00
Hellojack	190f24e7d7	Use xtls-rprx-direct as default	2022-06-02 15:59:23 +08:00
Hellojack	a302c97831	Update Xray-plugin v1.5.6	2022-05-31 10:19:30 +08:00
Hellojack	bf259316bd	clean	2022-05-29 13:31:15 +08:00
Hellojack	03c9534a02	Fix Invoke-WebRequest alias	2022-05-29 13:22:59 +08:00
Hellojack	7513b734fc	Update Go version	2022-05-29 13:16:16 +08:00
Hellojack	3774452751	Delete old mmdb database	2022-05-29 13:12:14 +08:00
Hellojack	4b68b363f7	Use @Loyalsoldier/geoip	2022-05-29 13:09:05 +08:00
Hellojack	bfc806b71e	Use @Loyalsoldier/geoip	2022-05-29 13:07:55 +08:00
Hellojack	baed3e07cd	Update Xray-core and Xray-plugin	2022-05-27 18:28:43 +08:00
AmazingDM	2969b4420d	Merge pull request #812 from NarukawaHime/main Add VMess zero method	2022-03-29 18:45:32 +08:00
NarukawaHime	57b438af7c	Add VMess zero method	2022-03-26 22:54:11 +08:00
AmazingDM	2f685a2c6f	clean	2022-03-22 20:45:17 +08:00
AmazingDM	7f38a1ff05	delete sponsor	2022-03-22 20:44:45 +08:00