renun/NTrace-core
1
0
Fork 0
mirror of https://github.com/nxtrace/NTrace-core.git synced 2025-08-12 06:26:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

由于9.0.0.0/8 以及11.0.0.0/8大量用于其他IDC业务，因此清除特殊标记

Browse Source
This commit is contained in:
tsosunchia
2022-06-02 20:38:43 +08:00
parent 986b8ce300
commit 80a75288d2
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
printer/printer.go
View File

@@ -52,11 +52,11 @@ func formatIpGeoData(ip string, data *ipgeo.IPGeoData) string {
// TODO: 判断阿里云和腾讯云内网，数据不足，有待进一步完善
// TODO: 移动IDC判断到Hop.fetchIPData函数，减少API调用
if strings.HasPrefix(ip, "9.") {
res = append(res, "局域网", "腾讯云")
res = append(res, "LAN Address", "")
} else if strings.HasPrefix(ip, "11.") {
res = append(res, "局域网", "阿里云")
res = append(res, "LAN Address", "")
} else if data.Country == "" {
res = append(res, "局域网")
res = append(res, "LAN Address")
} else {
// 有些IP的归属信息为空，这个时候将ISP的信息填入
if data.Owner == "" {

11
printer/tableprinter.go
View File

@@ -2,9 +2,10 @@ package printer
import (
"fmt"
"github.com/xgadget-lab/nexttrace/ipgeo"
"strings"
"github.com/xgadget-lab/nexttrace/ipgeo"
"github.com/xgadget-lab/nexttrace/trace"
"github.com/fatih/color"
@@ -73,16 +74,16 @@ func tableDataGenerator(h trace.Hop) *rowData {
Hop: fmt.Sprint(h.TTL),
IP: IP,
Latency: lantency,
Country: "局域网",
Owner: "腾讯云",
Country: "LAN Address",
Owner: "",
}
} else if strings.HasPrefix(IP, "11.") {
return &rowData{
Hop: fmt.Sprint(h.TTL),
IP: IP,
Latency: lantency,
Country: "局域网",
Owner: "阿里云",
Country: "LAN Address",
Owner: "",
}
}

6
trace/temp_printer.go
View File

@@ -39,11 +39,11 @@ func formatIpGeoData(ip string, data *ipgeo.IPGeoData) string {
// TODO: 判断阿里云和腾讯云内网，数据不足，有待进一步完善
// TODO: 移动IDC判断到Hop.fetchIPData函数，减少API调用
if strings.HasPrefix(ip, "9.") {
res = append(res, "局域网", "腾讯云")
res = append(res, "LAN Address", "")
} else if strings.HasPrefix(ip, "11.") {
res = append(res, "局域网", "阿里云")
res = append(res, "LAN Address", "")
} else if data.Country == "" {
res = append(res, "局域网")
res = append(res, "LAN Address")
} else {
// 有些IP的归属信息为空，这个时候将ISP的信息填入
if data.Owner == "" {