diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml index bc474b4..2d09688 100644 --- a/ProxySU/MainWindow.xaml +++ b/ProxySU/MainWindow.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:ProxySU" mc:Ignorable="d" - Title="ProxySU - v2.4.22 Beta1" Height="675" Width="650"> + Title="ProxySU - v2.4.22 Beta2" Height="675" Width="650"> diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index a0ea0e3..95266bf 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -7473,7 +7473,18 @@ namespace ProxySU MainWindowsShowInfo(currentStatus); //string[] dns64 = new string[2]; var dns64 = FilterFastestIP(client); - + + if (functionResult == false) + { + //****** "未能找到有效的Nat64网关......" ****** + currentStatus = Application.Current.FindResource("DisplayInstallInfo_FindFastestSetUpNat64Failed").ToString(); + MainWindowsShowInfo(currentStatus); + MessageBox.Show(currentStatus); + FunctionResultErr(); + client.Disconnect(); + return false; + } + //****** "当前主机最快的Nat64网关为:" ****** //currentStatus = Application.Current.FindResource("DisplayInstallInfo_FindFastestNat64AsIs").ToString(); //MainWindowsShowInfo(currentStatus); @@ -7542,11 +7553,17 @@ namespace ProxySU "2a00:1098:2c::1", "2a09:11c0:100::53", }; - + //string[] gateNat64 = { + // "2a01:4f9:c010:3f02::1", + // "2001:67c:2b0::4", + // "2001:67c:2b0::6", + + //}; + List NatDns64s = new List(); foreach (string gateip in gateNat64) { - sshShellCommand = $"ping -c4 {gateip} | grep avg | awk '{{print $4}}'|cut -d/ -f2"; + sshShellCommand = $"ping6 -c4 {gateip} | grep avg | awk '{{print $4}}'|cut -d/ -f2"; currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); if (String.IsNullOrEmpty(currentShellCommandResult) != true) { @@ -7562,6 +7579,16 @@ namespace ProxySU } NatDns64s = NatDns64s.OrderBy(o => o.Avg).ToList(); int listCount = NatDns64s.Count; + currentStatus = listCount.ToString() + " NAT64 gateways are valid"; + MainWindowsShowInfo(currentStatus); + if (listCount < 1) + { + functionResult = false; + } + else + { + functionResult = true; + } string[] returnstr = new string[listCount]; for(int i=0;iis checking whether the domain name is resolved to the IP of the current VPS... is detecting whether it is a pure ipv6 host... Finding the fastest Nat64 gateway... + Failed to find a valid Nat64 gateway... The fastest Nat64 gateway of the current host is: Nat64 gateway is being set up...... Nat64 gateway is being deleted... diff --git a/ProxySU/Translations/ProxySU.zh-CN.xaml b/ProxySU/Translations/ProxySU.zh-CN.xaml index d2f6da7..821e7e3 100644 --- a/ProxySU/Translations/ProxySU.zh-CN.xaml +++ b/ProxySU/Translations/ProxySU.zh-CN.xaml @@ -299,6 +299,7 @@ 正在检测域名是否解析到当前VPS的IP上...... 正在检测是否为纯ipv6主机...... 正在查找最快的Nat64网关...... + 未能找到有效的Nat64网关...... 当前主机最快的Nat64网关为: 正在设置Nat64网关...... 正在删除Nat64网关...... diff --git a/ProxySU/Translations/ProxySU.zh-TW.xaml b/ProxySU/Translations/ProxySU.zh-TW.xaml index cdceeba..d68f3f3 100644 --- a/ProxySU/Translations/ProxySU.zh-TW.xaml +++ b/ProxySU/Translations/ProxySU.zh-TW.xaml @@ -294,6 +294,7 @@ 正在檢測域名是否解析到當前VPS的IP上...... 正在檢測是否為純ipv6主機...... 正在查找最快的Nat64網關...... + 未能找到有效的Nat64網關...... 當前主機最快的Nat64網關為: 正在設置Nat64網關...... 正在刪除Nat64網關...... diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip index ed49d59..8e58146 100644 Binary files a/ProxySU/bin/Beta/Beta.zip and b/ProxySU/bin/Beta/Beta.zip differ