Merge pull request nxtrace#173 from nxtrace/main

fix bug: ipv6局域网地址错误显示为INVALID
nxtrace · Oct 11, 2023 · 3164acf · 3164acf
2 parents 239b1c2 + 8b30ef3
commit 3164acf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ipgeo/ipfilter.go b/ipgeo/ipfilter.go
@@ -158,7 +158,7 @@ func Filter(ip string) (*IPGeoData, bool) {
 	default:
 	}
 	// 判断是否为v6 且不在2000::/3
-	if net.ParseIP(ip).To4() == nil && !cidrRangeContains("2000::/3", ip) {
+	if net.ParseIP(ip).To4() == nil && !cidrRangeContains("2000::/3", ip) && !isFiltered {
 		asn = ""
 		whois = "INVALID"
 		isFiltered = true

diff --git a/ipgeo/ipgeo_test.go b/ipgeo/ipgeo_test.go
@@ -38,7 +38,7 @@ func TestXxx(t *testing.T) {
 }
 
 func TestFilter(t *testing.T) {
-	res, err := Filter("::1")
+	res, err := Filter("fd11::1")
 	//打印whois信息
 	fmt.Println(res.Whois)
 	print(err)