Skip to content

Commit

Permalink
fix url to hostname parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
Archeb committed Dec 14, 2023
1 parent 3d79ff3 commit 859bd75
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
11 changes: 5 additions & 6 deletions MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -461,23 +461,22 @@ private void StartTracerouteButton_Click(object sender, EventArgs e)
{
ResolvedIPSelection.Visible = false; // 隐藏 IP 选择框
IPAddress userInputAddress;
string userInputBoxText = HostInputBox.Text;
// 去除输入框两侧的空格
userInputBoxText = userInputBoxText.Trim();
HostInputBox.Text = HostInputBox.Text.Trim();

Uri uri;
if (Uri.TryCreate(HostInputBox.Text, UriKind.Absolute, out uri) && uri.Host != "")
{
// 是合法的 URL
userInputBoxText = uri.Host;
HostInputBox.Text = uri.Host;
}

// 如果有冒号而且有点(IPv4),去除冒号后面的内容
if (userInputBoxText.IndexOf(":") != -1 && userInputBoxText.IndexOf(".") != -1)
if (HostInputBox.Text.IndexOf(":") != -1 && HostInputBox.Text.IndexOf(".") != -1)
{
userInputBoxText = userInputBoxText.Split(':')[0];
HostInputBox.Text = HostInputBox.Text.Split(':')[0];
}
if (IPAddress.TryParse(userInputBoxText, out userInputAddress))
if (IPAddress.TryParse(HostInputBox.Text, out userInputAddress))
{
// 是合法的 IPv4 / IPv6,把程序处理后的IP放回文本框
HostInputBox.Text = userInputAddress.ToString();
Expand Down
2 changes: 1 addition & 1 deletion OpenTrace.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Title>OpenTrace</Title>
<ApplicationIcon>icon.ico</ApplicationIcon>
<PackageIcon>icon.png</PackageIcon>
<Version>1.4.2.0</Version>
<Version>1.4.2.1</Version>
<Platforms>AnyCPU;x64</Platforms>
<PlatformTarget>AnyCPU</PlatformTarget>

Expand Down

0 comments on commit 859bd75

Please sign in to comment.