Merge branch 'master' into steam

Author: HMBSbige

README.md

@@ -14,8 +14,6 @@
 * Windows 10 1703 或以上
 * Microsoft.NET Framework 4.7.2 或以上
 
-可能兼容 Microsoft.NET Framework 4（未测试）
-
 # [Steam 上购买](https://store.steampowered.com/app/828090)
 
 ## 这是做什么的
@@ -28,14 +26,21 @@
 
 ## TXT列表格式举例
 ```
-www.youtube.com:80 YouTube 80端口 注释可包括空格
+# Google
+[2607:f8b0:4007:801::2004]:443 IPv6 地址
+172.217.14.68:80
 www.google.com 谷歌，默认443端口
+
+# Youtube
+[2607:f8b0:4007:80e::200e] IPv6 地址
+172.217.14.78 IPv4 地址
+www.youtube.com:80 80端口 注释可包括空格
 ```
 
 ## 应该支持
 * 高 DPI
 * 兼容 Win7
-
+* IPv6
 
 ## 待完成
 * 超时提示

TCPingInfoView.sln

@@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.27703.2042
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TCPingInfoView", "TCPingInfoView\TCPingInfoView.csproj", "{9CC24A76-98CD-4824-942F-C617373F8428}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TCPingInfoViewTests", "TCPingInfoViewTests\TCPingInfoViewTests.csproj", "{CFD67279-1B90-4F03-9BDB-5C4C86722D63}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{9CC24A76-98CD-4824-942F-C617373F8428}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9CC24A76-98CD-4824-942F-C617373F8428}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9CC24A76-98CD-4824-942F-C617373F8428}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFD67279-1B90-4F03-9BDB-5C4C86722D63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFD67279-1B90-4F03-9BDB-5C4C86722D63}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFD67279-1B90-4F03-9BDB-5C4C86722D63}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CFD67279-1B90-4F03-9BDB-5C4C86722D63}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TCPingInfoView/Forms/LogForm.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Windows.Forms;
-using TCPingInfoView.Collection;
 using TCPingInfoView.I18n;
 using TCPingInfoView.Model;
 using TCPingInfoView.Util;

TCPingInfoView/Forms/MainForm.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Sockets;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
@@ -38,8 +39,7 @@ public MainForm()
 
 		private static string ExeName => Assembly.GetExecutingAssembly().GetName().Name;
 
-		private readonly AppConfig Config =
-				new AppConfig(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"{ExeName}.json"));
+		private readonly AppConfig Config = new AppConfig(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"{ExeName}.json"));
 
 		private static string ListPath => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"{ExeName}.txt");
 
@@ -435,7 +435,7 @@ private void FirstPing()
 						return;
 					}
 
-					if (IPFormatter.IsIPv4Address(mainTable[i].HostsName)) //反查DNS
+					if (IPFormatter.IsIPAddress(mainTable[i].HostsName)) //反查DNS
 					{
 						PingOne(i);
 
@@ -459,7 +459,7 @@ private void FirstPing()
 
 						if (ip != null)
 						{
-							mainTable[i].Endpoint = $@"{ip}:{rawTable[i].Port}";
+							mainTable[i].Endpoint = ip.AddressFamily == AddressFamily.InterNetwork ? $@"{ip}:{rawTable[i].Port}" : $@"[{ip}]:{rawTable[i].Port}";
 						}
 						PingOne(i);
 					}
@@ -483,15 +483,15 @@ private void PingOne(int index)
 
 				if (ip != null)
 				{
-					mainTable[index].Endpoint = $@"{ip}:{rawTable[index].Port}";
+					mainTable[index].Endpoint = ip.AddressFamily == AddressFamily.InterNetwork ? $@"{ip}:{rawTable[index].Port}" : $@"[{ip}]:{rawTable[index].Port}";
 				}
 				else
 				{
 					return;
 				}
 			}
 
-			var ipe = IPFormatter.ToIPEndPoint(mainTable[index].Endpoint, 443);
+			var ipe = IPFormatter.ToIPEndPoint(mainTable[index].Endpoint);
 			double? latency = null;
 			var res = Timeout;
 			var time = DateTime.Now;

TCPingInfoView/NetUtils/IPFormatter.cs

@@ -1,29 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
+using System.Net;
 using System.Text.RegularExpressions;
 
 namespace TCPingInfoView.NetUtils
 {
 	public static class IPFormatter
 	{
-		private static readonly Regex Ipv4Pattern = new Regex("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){1}(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){2}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$");
+		public static readonly Regex EndPointRegexStr = new Regex(@"^\[(.*)\]:(\d{1,5})|(.*):(\d{1,5})$");
 
-		public static bool IsIPv4Address(string input)
+		public static bool IsIPAddress(string input)
 		{
-			return Ipv4Pattern.IsMatch(input);
-		}
-
-		public static bool IsIPv4Address(IPAddress ipAddress)
-		{
-			return ipAddress.AddressFamily == AddressFamily.InterNetwork;
-		}
-
-		public static bool IsIPv6Address(IPAddress ipAddress)
-		{
-			return ipAddress.AddressFamily == AddressFamily.InterNetworkV6;
+			return IPAddress.TryParse(input, out _);
 		}
 
 		public static bool IsPort(int port)
@@ -36,70 +22,48 @@ public static bool IsPort(int port)
 			return false;
 		}
 
-		public static IPEndPoint ToIPEndPoint(string str, int defaultport)
+		public static IPEndPoint ToIPEndPoint(string str, int defaultPort = 443)
 		{
-			if (string.IsNullOrWhiteSpace(str) || !IsPort(defaultport))
+			if (string.IsNullOrWhiteSpace(str) || !IsPort(defaultPort))
 			{
 				return null;
 			}
 
-			var s = str.Split(':');
-			if (s.Length == 1 || s.Length == 2)
+			var sp = EndPointRegexStr.Match(str).Groups;
+			if (sp.Count == 5)
 			{
-				if (!IsIPv4Address(s[0]))
+				var hostname = string.IsNullOrWhiteSpace(sp[1].Value) ? sp[3].Value : sp[1].Value;
+				if (IPAddress.TryParse(hostname, out var ip))
 				{
-					return null;
+					if (int.TryParse(string.IsNullOrWhiteSpace(sp[2].Value) ? sp[4].Value : sp[2].Value, out var port))
+					{
+						if (IsPort(port))
+						{
+							return new IPEndPoint(ip, port);
+						}
+					}
 				}
-
-				var ip = IPAddress.Parse(s[0]);
-				if (s.Length == 2)
+			}
+			else if (sp.Count == 1)
+			{
+				var groups = Regex.Match(str, @"^\[(.*)\]$").Groups;
+				if (groups.Count == 2)
 				{
-					var port = Convert.ToInt32(s[1]);
-					if (IsPort(port))
+					if (IPAddress.TryParse(groups[1].Value, out var ip))
 					{
-						return ToIPEndPoint(ip, port);
+						return new IPEndPoint(ip, defaultPort);
 					}
 				}
 				else
 				{
-					return ToIPEndPoint(ip, defaultport);
+					if (IPAddress.TryParse(str, out var ip))
+					{
+						return new IPEndPoint(ip, defaultPort);
+					}
 				}
 			}
 
 			return null;
 		}
-
-		public static IPEndPoint ToIPEndPoint(IPAddress ip, int port)
-		{
-			return new IPEndPoint(ip, port);
-		}
-
-		public static IEnumerable<IPEndPoint> ToIPEndPoints(string str, int defaultport, char[] separator)
-		{
-			var s = str.Split(separator, StringSplitOptions.RemoveEmptyEntries);
-			return s.Select(ipEndPointsStr => ToIPEndPoint(ipEndPointsStr, defaultport)).Where(ipend => ipend != null);
-		}
-
-		public static IEnumerable<IPEndPoint> ToIPEndPoints(IEnumerable<IPAddress> ips, int port)
-		{
-			return ips.Select(ip => ToIPEndPoint(ip, port));
-		}
-
-		public static IPAddress PTRName2IP(string str)
-		{
-			var s = str.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries);
-			return IPAddress.Parse($@"{s[3]}.{s[2]}.{s[1]}.{s[0]}");
-		}
-
-		public static string IPStr2PTRName(string str)
-		{
-			if (!IsIPv4Address(str))
-			{
-				return string.Empty;
-			}
-
-			var s = str.Split('.');
-			return $@"{s[3]}.{s[2]}.{s[1]}.{s[0]}.in-addr.arpa";
-		}
 	}
 }