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

创建 NAT 测试方法记录是否测试完毕,改进重新测试NAT

Browse Source
This commit is contained in:
ChsBuffer
2020-08-29 22:14:07 +08:00
parent 7310126a39
commit 68880f0c9b
2 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Netch/Controllers/MainController.cs
View File

@@ -205,20 +205,7 @@ namespace Netch.Controllers
case 0:
case 1:
case 2:
_ = Task.Run(() =>
{
Global.MainForm.NatTypeStatusText(i18N.Translate("Starting NatTester"));
// Thread.Sleep(1000);
var (nttResult, natType, localEnd, publicEnd) = pNTTController.Start();
if (nttResult)
{
var country = Utils.Utils.GetCityCode(publicEnd);
Global.MainForm.NatTypeStatusText(natType, country);
}
else
Global.MainForm.NatTypeStatusText(natType);
});
NatTest();
break;
}
}
@@ -240,19 +227,29 @@ namespace Netch.Controllers
return result;
}
public bool NttTested;
/// <summary>
/// 重测NAT
/// 测试 NAT
/// </summary>
public void RetryNatTest()
public void NatTest()
{
_ = Task.Run(() =>
NttTested = false;
Task.Run(() =>
{
Global.MainForm.NatTypeStatusText(i18N.Translate("Starting NatTester"));
// Thread.Sleep(1000);
var (nttResult, natType, localEnd, publicEnd) = pNTTController.Start();
var country = Utils.Utils.GetCityCode(publicEnd);
if (nttResult) Global.MainForm.NatTypeStatusText(natType, country);
if (nttResult)
{
var country = Utils.Utils.GetCityCode(publicEnd);
Global.MainForm.NatTypeStatusText(natType, country);
}
else
Global.MainForm.NatTypeStatusText(natType);
NttTested = true;
});
}

5
Netch/Forms/MainForm.cs
View File

@@ -444,10 +444,9 @@ namespace Netch.Forms
private void NatTypeStatusLabel_Click(object sender, EventArgs e)
{
//一个不太优雅的🔒
if (_state == State.Started && NatTypeStatusLabel.ToString().Contains("["))
if (_state == State.Started && _mainController.NttTested)
{
_mainController.RetryNatTest();
_mainController.NatTest();
}
}
}