up 7.13.7

https://github.com/2dust/v2rayN/issues/7644

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.13.3</Version>
+        <Version>7.13.7</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -5,10 +5,10 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.2" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.2" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.2" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.3" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.3" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.3" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.3" />
     <PackageVersion Include="CliWrap" Version="3.9.0" />
     <PackageVersion Include="Downloader" Version="4.0.2" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />

v2rayN/ServiceLib/Common/FileManager.cs

@@ -223,4 +223,28 @@ public static class FileManager
             // ignored
         }
     }
+
+    /// <summary>
+    /// Creates a Linux shell file with the specified contents.
+    /// </summary>
+    /// <param name="fileName"></param>
+    /// <param name="contents"></param>
+    /// <param name="overwrite"></param>
+    /// <returns></returns>
+    public static async Task<string> CreateLinuxShellFile(string fileName, string contents, bool overwrite)
+    {
+        var shFilePath = Utils.GetBinConfigPath(fileName);
+
+        // Check if the file already exists and if we should overwrite it
+        if (!overwrite && File.Exists(shFilePath))
+        {
+            return shFilePath;
+        }
+
+        File.Delete(shFilePath);
+        await File.WriteAllTextAsync(shFilePath, contents);
+        await Utils.SetLinuxChmod(shFilePath);
+
+        return shFilePath;
+    }
 }

v2rayN/ServiceLib/Common/Utils.cs

@@ -390,13 +390,44 @@ public class Utils
     {
         if (IPAddress.TryParse(ip, out var address))
         {
+            // Loopback address check (127.0.0.1 for IPv4, ::1 for IPv6)
+            if (IPAddress.IsLoopback(address))
+                return true;
+
             var ipBytes = address.GetAddressBytes();
-            if (ipBytes[0] == 10)
-                return true;
-            if (ipBytes[0] == 172 && ipBytes[1] >= 16 && ipBytes[1] <= 31)
-                return true;
-            if (ipBytes[0] == 192 && ipBytes[1] == 168)
-                return true;
+            if (address.AddressFamily == AddressFamily.InterNetwork)
+            {
+                // IPv4 private address check
+                if (ipBytes[0] == 10)
+                    return true;
+                if (ipBytes[0] == 172 && ipBytes[1] >= 16 && ipBytes[1] <= 31)
+                    return true;
+                if (ipBytes[0] == 192 && ipBytes[1] == 168)
+                    return true;
+            }
+            else if (address.AddressFamily == AddressFamily.InterNetworkV6)
+            {
+                // IPv6 private address check
+                // Link-local address fe80::/10
+                if (ipBytes[0] == 0xfe && (ipBytes[1] & 0xc0) == 0x80)
+                    return true;
+                
+                // Unique local address fc00::/7 (typically fd00::/8)
+                if ((ipBytes[0] & 0xfe) == 0xfc)
+                    return true;
+                
+                // Private portion in IPv4-mapped addresses ::ffff:0:0/96
+                if (address.IsIPv4MappedToIPv6)
+                {
+                    var ipv4Bytes = ipBytes.Skip(12).ToArray();
+                    if (ipv4Bytes[0] == 10)
+                        return true;
+                    if (ipv4Bytes[0] == 172 && ipv4Bytes[1] >= 16 && ipv4Bytes[1] <= 31)
+                        return true;
+                    if (ipv4Bytes[0] == 192 && ipv4Bytes[1] == 168)
+                        return true;
+                }
+            }
         }
 
         return false;

v2rayN/ServiceLib/Global.cs

@@ -38,6 +38,8 @@ public class Global
     public const string PacFileName = NamespaceSample + "pac";
     public const string ProxySetOSXShellFileName = NamespaceSample + "proxy_set_osx_sh";
     public const string ProxySetLinuxShellFileName = NamespaceSample + "proxy_set_linux_sh";
+    public const string KillAsSudoOSXShellFileName = NamespaceSample + "kill_as_sudo_osx_sh";
+    public const string KillAsSudoLinuxShellFileName = NamespaceSample + "kill_as_sudo_linux_sh";
 
     public const string DefaultSecurity = "auto";
     public const string DefaultNetwork = "tcp";

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -246,6 +246,7 @@ public class ConfigHandler
             item.PublicKey = profileItem.PublicKey;
             item.ShortId = profileItem.ShortId;
             item.SpiderX = profileItem.SpiderX;
+            item.Mldsa65Verify = profileItem.Mldsa65Verify;
             item.Extra = profileItem.Extra;
             item.MuxEnabled = profileItem.MuxEnabled;
         }

v2rayN/ServiceLib/Handler/CoreAdminHandler.cs

@@ -1,6 +1,7 @@
 using System.Diagnostics;
 using System.Text;
 using CliWrap;
+using CliWrap.Buffered;
 
 namespace ServiceLib.Handler;
 
@@ -9,9 +10,9 @@ public class CoreAdminHandler
     private static readonly Lazy<CoreAdminHandler> _instance = new(() => new());
     public static CoreAdminHandler Instance => _instance.Value;
     private Config _config;
-    private readonly string _sudoAccessText = "SUDO_ACCESS_VERIFIED";
     private Action<bool, string>? _updateFunc;
     private int _linuxSudoPid = -1;
+    private const string _tag = "CoreAdminHandler";
 
     public async Task Init(Config config, Action<bool, string> updateFunc)
     {
@@ -21,6 +22,8 @@ public class CoreAdminHandler
         }
         _config = config;
         _updateFunc = updateFunc;
+
+        await Task.CompletedTask;
     }
 
     private void UpdateFunc(bool notify, string msg)
@@ -30,8 +33,11 @@ public class CoreAdminHandler
 
     public async Task<Process?> RunProcessAsLinuxSudo(string fileName, CoreInfo coreInfo, string configPath)
     {
+        StringBuilder sb = new();
+        sb.AppendLine("#!/bin/bash");
         var cmdLine = $"{fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetBinConfigPath(configPath).AppendQuotes())}";
-        var shFilePath = await CreateLinuxShellFile(cmdLine, "run_as_sudo.sh");
+        sb.AppendLine($"sudo -S {cmdLine}");
+        var shFilePath = await FileManager.CreateLinuxShellFile("run_as_sudo.sh", sb.ToString(), true);
 
         Process proc = new()
         {
@@ -45,26 +51,18 @@ public class CoreAdminHandler
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
                 CreateNoWindow = true,
-                StandardInputEncoding = Encoding.UTF8,
                 StandardOutputEncoding = Encoding.UTF8,
                 StandardErrorEncoding = Encoding.UTF8,
             }
         };
 
-        var sudoVerified = false;
-        DataReceivedEventHandler dataHandler = (sender, e) =>
+        void dataHandler(object sender, DataReceivedEventArgs e)
         {
             if (e.Data.IsNotEmpty())
             {
-                if (!sudoVerified && e.Data.Contains(_sudoAccessText))
-                {
-                    sudoVerified = true;
-                    UpdateFunc(false, ResUI.SudoPwdVerfiedSuccessTip + Environment.NewLine);
-                    return;
-                }
                 UpdateFunc(false, e.Data + Environment.NewLine);
             }
-        };
+        }
 
         proc.OutputDataReceived += dataHandler;
         proc.ErrorDataReceived += dataHandler;
@@ -73,8 +71,6 @@ public class CoreAdminHandler
         proc.BeginOutputReadLine();
         proc.BeginErrorReadLine();
 
-        await Task.Delay(10);
-        await proc.StandardInput.WriteLineAsync(AppHandler.Instance.LinuxSudoPwd);
         await Task.Delay(10);
         await proc.StandardInput.WriteLineAsync(AppHandler.Instance.LinuxSudoPwd);
 
@@ -96,35 +92,27 @@ public class CoreAdminHandler
             return;
         }
 
-        var cmdLine = $"pkill -P {_linuxSudoPid} ; kill {_linuxSudoPid}";
-        var shFilePath = await CreateLinuxShellFile(cmdLine, "kill_as_sudo.sh");
+        try
+        {
+            var shellFileName = Utils.IsOSX() ? Global.KillAsSudoOSXShellFileName : Global.KillAsSudoLinuxShellFileName;
+            var shFilePath = await FileManager.CreateLinuxShellFile("kill_as_sudo.sh", EmbedUtils.GetEmbedText(shellFileName), true);
+            if (shFilePath.Contains(' '))
+            {
+                shFilePath = shFilePath.AppendQuotes();
+            }
+            var arg = new List<string>() { "-c", $"sudo -S {shFilePath} {_linuxSudoPid}" };
+            var result = await Cli.Wrap(Global.LinuxBash)
+                .WithArguments(arg)
+                .WithStandardInputPipe(PipeSource.FromString(AppHandler.Instance.LinuxSudoPwd))
+                .ExecuteBufferedAsync();
 
-        await Cli.Wrap(shFilePath)
-           .WithStandardInputPipe(PipeSource.FromString(AppHandler.Instance.LinuxSudoPwd))
-           .ExecuteAsync();
+            UpdateFunc(false, result.StandardOutput.ToString());
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
 
         _linuxSudoPid = -1;
     }
-
-    private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)
-    {
-        var shFilePath = Utils.GetBinConfigPath(fileName);
-        File.Delete(shFilePath);
-
-        var sb = new StringBuilder();
-        sb.AppendLine("#!/bin/sh");
-        if (Utils.IsAdministrator())
-        {
-            sb.AppendLine($"{cmdLine}");
-        }
-        else
-        {
-            sb.AppendLine($"sudo -S echo \"{_sudoAccessText}\" && sudo -S {cmdLine}");
-        }
-
-        await File.WriteAllTextAsync(shFilePath, sb.ToString());
-        await Utils.SetLinuxChmod(shFilePath);
-
-        return shFilePath;
-    }
 }

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -25,6 +25,8 @@ public class CoreHandler
         Environment.SetEnvironmentVariable(Global.V2RayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
         Environment.SetEnvironmentVariable(Global.XrayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
         Environment.SetEnvironmentVariable(Global.XrayLocalCert, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
+        // TODO Temporary addition to support proper use of sing-box v1.12
+        Environment.SetEnvironmentVariable("ENABLE_DEPRECATED_SPECIAL_OUTBOUNDS", "true", EnvironmentVariableTarget.Process);
 
         //Copy the bin folder to the storage location (for init)
         if (Environment.GetEnvironmentVariable(Global.LocalAppData) == "1")
@@ -280,13 +282,13 @@ public class CoreHandler
 
         if (displayLog)
         {
-            DataReceivedEventHandler dataHandler = (sender, e) =>
+            void dataHandler(object sender, DataReceivedEventArgs e)
             {
                 if (e.Data.IsNotEmpty())
                 {
                     UpdateFunc(false, e.Data + Environment.NewLine);
                 }
-            };
+            }
             proc.OutputDataReceived += dataHandler;
             proc.ErrorDataReceived += dataHandler;
         }

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -59,6 +59,10 @@ public class BaseFmt
         {
             dicQuery.Add("spx", Utils.UrlEncode(item.SpiderX));
         }
+        if (item.Mldsa65Verify.IsNotEmpty())
+        {
+            dicQuery.Add("pqv", Utils.UrlEncode(item.Mldsa65Verify));
+        }       
         if (item.AllowInsecure.Equals("true"))
         {
             dicQuery.Add("allowInsecure", "1");
@@ -159,6 +163,7 @@ public class BaseFmt
         item.PublicKey = Utils.UrlDecode(query["pbk"] ?? "");
         item.ShortId = Utils.UrlDecode(query["sid"] ?? "");
         item.SpiderX = Utils.UrlDecode(query["spx"] ?? "");
+        item.Mldsa65Verify = Utils.UrlDecode(query["pqv"] ?? "");
         item.AllowInsecure = (query["allowInsecure"] ?? "") == "1" ? "true" : "";
 
         item.Network = query["type"] ?? nameof(ETransport.tcp);

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs

@@ -18,14 +18,7 @@ public class ProxySettingLinux
 
     private static async Task ExecCmd(List<string> args)
     {
-        var fileName = Utils.GetBinConfigPath(_proxySetFileName);
-        if (!File.Exists(fileName))
-        {
-            var contents = EmbedUtils.GetEmbedText(Global.ProxySetLinuxShellFileName);
-            await File.AppendAllTextAsync(fileName, contents);
-
-            await Utils.SetLinuxChmod(fileName);
-        }
+        var fileName = await FileManager.CreateLinuxShellFile(_proxySetFileName, EmbedUtils.GetEmbedText(Global.ProxySetLinuxShellFileName), false);
 
         await Utils.GetCliWrapOutput(fileName, args);
     }

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs

@@ -23,14 +23,7 @@ public class ProxySettingOSX
 
     private static async Task ExecCmd(List<string> args)
     {
-        var fileName = Utils.GetBinConfigPath(_proxySetFileName);
-        if (!File.Exists(fileName))
-        {
-            var contents = EmbedUtils.GetEmbedText(Global.ProxySetOSXShellFileName);
-            await File.AppendAllTextAsync(fileName, contents);
-
-            await Utils.SetLinuxChmod(fileName);
-        }
+        var fileName = await FileManager.CreateLinuxShellFile(_proxySetFileName, EmbedUtils.GetEmbedText(Global.ProxySetOSXShellFileName), false);
 
         await Utils.GetCliWrapOutput(fileName, args);
     }

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -32,7 +32,7 @@ public class ProfileItem : ReactiveObject
     public string GetSummary()
     {
         var summary = $"[{(ConfigType).ToString()}] ";
-        var arrAddr = Address.Split('.');
+        var arrAddr = Address.Contains(':') ? Address.Split(':') : Address.Split('.');
         var addr = arrAddr.Length switch
         {
             > 2 => $"{arrAddr.First()}***{arrAddr.Last()}",
@@ -93,6 +93,7 @@ public class ProfileItem : ReactiveObject
     public string PublicKey { get; set; }
     public string ShortId { get; set; }
     public string SpiderX { get; set; }
+    public string Mldsa65Verify { get; set; }
     public string Extra { get; set; }
     public bool? MuxEnabled { get; set; }
 }

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -340,6 +340,7 @@ public class TlsSettings4Ray
     public string? publicKey { get; set; }
     public string? shortId { get; set; }
     public string? spiderX { get; set; }
+    public string? mldsa65Verify { get; set; }
 }
 
 public class TcpSettings4Ray

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -2211,15 +2211,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Sudo password has been verified successfully, please ignore the incorrect password prompts! 的本地化字符串。
-        /// </summary>
-        public static string SudoPwdVerfiedSuccessTip {
-            get {
-                return ResourceManager.GetString("SudoPwdVerfiedSuccessTip", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Address 的本地化字符串。
         /// </summary>
@@ -2526,6 +2517,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Mldsa65Verify 的本地化字符串。
+        /// </summary>
+        public static string TbMldsa65Verify {
+            get {
+                return ResourceManager.GetString("TbMldsa65Verify", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Transport protocol(network) 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -1395,10 +1395,10 @@
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
     <value>Can fill in the configuration remarks, please make sure it exist and are unique</value>
   </data>
-  <data name="SudoPwdVerfiedSuccessTip" xml:space="preserve">
-    <value>Sudo password has been verified successfully, please ignore the incorrect password prompts!</value>
-  </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Incorrect password, please try again.</value>
   </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1395,10 +1395,10 @@
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
     <value>Can fill in the configuration remarks, please make sure it exist and are unique</value>
   </data>
-  <data name="SudoPwdVerfiedSuccessTip" xml:space="preserve">
-    <value>Sudo password has been verified successfully, please ignore the incorrect password prompts!</value>
-  </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Incorrect password, please try again.</value>
   </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1395,10 +1395,10 @@
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
     <value>Can fill in the configuration remarks, please make sure it exist and are unique</value>
   </data>
-  <data name="SudoPwdVerfiedSuccessTip" xml:space="preserve">
-    <value>Sudo password has been verified successfully, please ignore the incorrect password prompts!</value>
-  </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>Incorrect password, please try again.</value>
   </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -1392,10 +1392,10 @@
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
     <value>可以填写配置文件别名，请确保存在并唯一</value>
   </data>
-  <data name="SudoPwdVerfiedSuccessTip" xml:space="preserve">
-    <value>sudo 密码已经验证成功，请忽略错误密码提示！</value>
-  </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>密码错误，请重试。</value>
   </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -1392,10 +1392,10 @@
   <data name="TbRuleOutboundTagTip" xml:space="preserve">
     <value>可以填寫設定檔別名，請確保存在並唯一</value>
   </data>
-  <data name="SudoPwdVerfiedSuccessTip" xml:space="preserve">
-    <value>sudo 密碼已經驗證成功，請忽略錯誤密碼提示！</value>
-  </data>
   <data name="SudoIncorrectPasswordTip" xml:space="preserve">
     <value>密碼錯誤，請重試。</value>
   </data>
+  <data name="TbMldsa65Verify" xml:space="preserve">
+    <value>Mldsa65Verify</value>
+  </data>
 </root>

v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+#
+# Process Terminator Script for Linux
+# This script forcibly terminates a process and all its child processes
+#
+
+# Check if PID argument is provided
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <PID>"
+    exit 1
+fi
+
+PID=$1
+
+# Validate that input is a valid PID (numeric)
+if ! [[ "$PID" =~ ^[0-9]+$ ]]; then
+    echo "Error: The PID must be a numeric value"
+    exit 1
+fi
+
+# Check if the process exists
+if ! ps -p $PID > /dev/null; then
+    echo "Warning: No process found with PID $PID"
+    exit 0
+fi
+
+# Recursive function to find and kill all child processes
+kill_children() {
+    local parent=$1
+    local children=$(ps -o pid --no-headers --ppid "$parent")
+    
+    # Output information about processes being terminated
+    echo "Processing children of PID: $parent..."
+    
+    # Process each child
+    for child in $children; do
+        # Recursively find and kill child's children first
+        kill_children "$child"
+        
+        # Force kill the child process
+        echo "Terminating child process: $child"
+        kill -9 "$child" 2>/dev/null || true
+    done
+}
+
+echo "============================================"
+echo "Starting termination of process $PID and all its children"
+echo "============================================"
+
+# Find and kill all child processes
+kill_children "$PID"
+
+# Finally kill the main process
+echo "Terminating main process: $PID"
+kill -9 "$PID" 2>/dev/null || true
+
+echo "============================================"
+echo "Process $PID and all its children have been terminated"
+echo "============================================"
+
+exit 0

v2rayN/ServiceLib/Sample/kill_as_sudo_osx_sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+# Process Terminator Script for macOS
+# This script forcibly terminates a process and all its descendant processes
+#
+
+# Check if PID argument is provided
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <PID>"
+    exit 1
+fi
+
+PID=$1
+
+# Validate that input is a valid PID (numeric)
+if ! [[ "$PID" =~ ^[0-9]+$ ]]; then
+    echo "Error: The PID must be a numeric value"
+    exit 1
+fi
+
+# Check if the process exists - using kill -0 which is more reliable on macOS
+if ! kill -0 $PID 2>/dev/null; then
+    echo "Warning: No process found with PID $PID"
+    exit 0
+fi
+
+# Recursive function to find and kill all descendant processes
+kill_descendants() {
+    local parent=$1
+    # Use ps -axo for macOS to ensure all processes are included
+    local children=$(ps -axo pid=,ppid= | awk -v ppid=$parent '$2==ppid {print $1}')
+
+    echo "Processing children of PID: $parent..."
+    for child in $children; do
+        kill_descendants "$child"
+        echo "Terminating child process: $child"
+        kill -9 "$child" 2>/dev/null || true
+    done
+}
+
+echo "============================================"
+echo "Starting termination of process $PID and all its descendants"
+echo "============================================"
+
+# Find and kill all descendant processes
+kill_descendants "$PID"
+
+# Finally kill the main process
+echo "Terminating main process: $PID"
+kill -9 "$PID" 2>/dev/null || true
+
+echo "============================================"
+echo "Process $PID and all its descendants have been terminated"
+echo "============================================"
+
+exit 0

v2rayN/ServiceLib/ServiceLib.csproj

@@ -28,6 +28,8 @@
 		<EmbeddedResource Include="Sample\custom_routing_white" />
 		<EmbeddedResource Include="Sample\dns_singbox_normal" />
 		<EmbeddedResource Include="Sample\dns_v2ray_normal" />
+		<EmbeddedResource Include="Sample\kill_as_sudo_linux_sh" />
+		<EmbeddedResource Include="Sample\kill_as_sudo_osx_sh" />
 		<EmbeddedResource Include="Sample\pac" />
 		<EmbeddedResource Include="Sample\proxy_set_linux_sh" /> 
 		<EmbeddedResource Include="Sample\proxy_set_osx_sh" />

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -519,7 +519,7 @@ public class CoreConfigSingboxService
     {
         try
         {
-            var listen = "::";
+            var listen = "0.0.0.0";
             singboxConfig.inbounds = [];
 
             if (!_config.TunModeItem.EnableTun

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -944,6 +944,7 @@ public class CoreConfigV2rayService
                     publicKey = node.PublicKey,
                     shortId = node.ShortId,
                     spiderX = node.SpiderX,
+                    mldsa65Verify = node.Mldsa65Verify,
                     show = false,
                 };
 

v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs

@@ -107,6 +107,7 @@ public class ThemeSettingViewModel : MyReactiveObject
             x.OfType<Button>(),
             x.OfType<TextBox>(),
             x.OfType<TextBlock>(),
+            x.OfType<SelectableTextBlock>(),
             x.OfType<Menu>(),
             x.OfType<ContextMenu>(),
             x.OfType<DataGridRow>(),
@@ -146,6 +147,7 @@ public class ThemeSettingViewModel : MyReactiveObject
                 x.OfType<Button>(),
                 x.OfType<TextBox>(),
                 x.OfType<TextBlock>(),
+                x.OfType<SelectableTextBlock>(),
                 x.OfType<Menu>(),
                 x.OfType<ContextMenu>(),
                 x.OfType<DataGridRow>(),

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -753,7 +753,7 @@
                     Grid.Row="7"
                     ColumnDefinitions="180,Auto"
                     IsVisible="False"
-                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
 
                     <TextBlock
                         Grid.Row="0"
@@ -823,6 +823,20 @@
                         Width="400"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
+
+                    <TextBlock
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbMldsa65Verify}" />
+                    <TextBox
+                        x:Name="txtMldsa65Verify"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
                 </Grid>
                 <Separator Grid.Row="8" Margin="{StaticResource MarginTb8}" />
             </Grid>

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs

@@ -185,6 +185,7 @@ public partial class AddServerWindow : WindowBase<AddServerViewModel>
             this.Bind(ViewModel, vm => vm.SelectedSource.PublicKey, v => v.txtPublicKey.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.ShortId, v => v.txtShortId.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.SpiderX, v => v.txtSpiderX.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SelectedSource.Mldsa65Verify, v => v.txtMldsa65Verify.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });

v2rayN/v2rayN.Desktop/Views/MsgView.axaml

@@ -69,34 +69,35 @@
                 IsChecked="True"
                 Theme="{DynamicResource SimpleToggleSwitch}" />
         </WrapPanel>
-        <TextBox
-            Name="txtMsg"
-            VerticalAlignment="Stretch"
-            BorderThickness="0"
-            Classes="TextArea"
-            IsReadOnly="True"
-            TextAlignment="Left"
-            TextWrapping="Wrap">
-            <TextBox.ContextMenu>
-                <ContextMenu>
-                    <MenuItem
-                        x:Name="menuMsgViewSelectAll"
-                        Click="menuMsgViewSelectAll_Click"
-                        Header="{x:Static resx:ResUI.menuMsgViewSelectAll}" />
-                    <MenuItem
-                        x:Name="menuMsgViewCopy"
-                        Click="menuMsgViewCopy_Click"
-                        Header="{x:Static resx:ResUI.menuMsgViewCopy}" />
-                    <MenuItem
-                        x:Name="menuMsgViewCopyAll"
-                        Click="menuMsgViewCopyAll_Click"
-                        Header="{x:Static resx:ResUI.menuMsgViewCopyAll}" />
-                    <MenuItem
-                        x:Name="menuMsgViewClear"
-                        Click="menuMsgViewClear_Click"
-                        Header="{x:Static resx:ResUI.menuMsgViewClear}" />
-                </ContextMenu>
-            </TextBox.ContextMenu>
-        </TextBox>
+
+        <ScrollViewer x:Name="msgScrollViewer" VerticalScrollBarVisibility="Auto">
+            <SelectableTextBlock
+                Name="txtMsg"
+                VerticalAlignment="Stretch"
+                Classes="TextArea"
+                TextAlignment="Left"
+                TextWrapping="Wrap">
+                <SelectableTextBlock.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem
+                            x:Name="menuMsgViewSelectAll"
+                            Click="menuMsgViewSelectAll_Click"
+                            Header="{x:Static resx:ResUI.menuMsgViewSelectAll}" />
+                        <MenuItem
+                            x:Name="menuMsgViewCopy"
+                            Click="menuMsgViewCopy_Click"
+                            Header="{x:Static resx:ResUI.menuMsgViewCopy}" />
+                        <MenuItem
+                            x:Name="menuMsgViewCopyAll"
+                            Click="menuMsgViewCopyAll_Click"
+                            Header="{x:Static resx:ResUI.menuMsgViewCopyAll}" />
+                        <MenuItem
+                            x:Name="menuMsgViewClear"
+                            Click="menuMsgViewClear_Click"
+                            Header="{x:Static resx:ResUI.menuMsgViewClear}" />
+                    </ContextMenu>
+                </SelectableTextBlock.ContextMenu>
+            </SelectableTextBlock>
+        </ScrollViewer>
     </DockPanel>
 </UserControl>

v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs

@@ -1,4 +1,5 @@
 using System.Reactive.Disposables;
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
@@ -9,9 +10,12 @@ namespace v2rayN.Desktop.Views;
 
 public partial class MsgView : ReactiveUserControl<MsgViewModel>
 {
+    private readonly ScrollViewer _scrollViewer;
+
     public MsgView()
     {
         InitializeComponent();
+        _scrollViewer = this.FindControl<ScrollViewer>("msgScrollViewer");
 
         ViewModel = new MsgViewModel(UpdateViewHandler);
 
@@ -43,14 +47,14 @@ public partial class MsgView : ReactiveUserControl<MsgViewModel>
         txtMsg.Text = msg.ToString();
         if (togScrollToEnd.IsChecked ?? true)
         {
-            txtMsg.CaretIndex = int.MaxValue;
+            _scrollViewer?.ScrollToEnd();
         }
     }
 
     public void ClearMsg()
     {
         ViewModel?.ClearMsg();
-        txtMsg.Clear();
+        txtMsg.Text = "";
     }
 
     private void menuMsgViewSelectAll_Click(object? sender, RoutedEventArgs e)

v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs

@@ -64,10 +64,9 @@ public partial class SudoPasswordInputView : UserControl
     {
         try
         {
-            // Use sudo -S echo command to verify password
+            // Use sudo echo command to verify password
             var arg = new List<string>() { "-c", "sudo -S echo SUDO_CHECK" };
-            var result = await CliWrap.Cli
-                .Wrap(Global.LinuxBash)
+            var result = await CliWrap.Cli.Wrap(Global.LinuxBash)
                 .WithArguments(arg)
                 .WithStandardInputPipe(CliWrap.PipeSource.FromString(password))
                 .ExecuteBufferedAsync();

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -979,6 +979,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="180" />
@@ -1064,6 +1065,22 @@
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbMldsa65Verify}" />
+                    <TextBox
+                        x:Name="txtMldsa65Verify"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left"
+                        Style="{StaticResource DefTextBox}" />
                 </Grid>
                 <Separator
                     Grid.Row="8"

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -179,6 +179,7 @@ public partial class AddServerWindow
             this.Bind(ViewModel, vm => vm.SelectedSource.PublicKey, v => v.txtPublicKey.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.ShortId, v => v.txtShortId.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.SpiderX, v => v.txtSpiderX.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SelectedSource.Mldsa65Verify, v => v.txtMldsa65Verify.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });