feat: 添加 report 模式

nxtrace · Jan 23, 2023 · 7619e74 · 7619e74
1 parent c682f90
commit 7619e74
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -39,7 +39,8 @@ func Excute() {
 	dataOrigin := parser.Selector("d", "data-provider", []string{"IP.SB", "IPInfo", "IPInsight", "IPAPI.com"}, &argparse.Options{Default: "LeoMoeAPI",
 		Help: "Choose IP Geograph Data Provider [LeoMoeAPI,IP.SB, IPInfo, IPInsight, IPAPI.com]"})
 	noRdns := parser.Flag("n", "no-rdns", &argparse.Options{Help: " Do not resolve IP addresses to their domain names"})
-	routePath := parser.Flag("r", "route-path", &argparse.Options{Help: "Print traceroute hop path by ASN and location"})
+	routePath := parser.Flag("P", "route-path", &argparse.Options{Help: "Print traceroute hop path by ASN and location"})
+	report := parser.Flag("r", "report", &argparse.Options{Help: "output using report mode"})
 	output := parser.Flag("o", "output", &argparse.Options{Help: "Write trace result to file (RealTimePrinter ONLY)"})
 	tablePrint := parser.Flag("t", "table", &argparse.Options{Help: "Output trace results as table"})
 	classicPrint := parser.Flag("c", "classic", &argparse.Options{Help: "Classic Output trace results like BestTrace"})
@@ -168,7 +169,9 @@ func Excute() {
 			}
 		}
 	} else {
-		conf.AsyncPrinter = printer.TracerouteTablePrinter
+		if !*report {
+			conf.AsyncPrinter = printer.TracerouteTablePrinter
+		}
 	}
 
 	res, err := trace.Traceroute(m, conf)

diff --git a/printer/realtime_printer.go b/printer/realtime_printer.go
@@ -72,6 +72,8 @@ func RealtimePrinter(res *trace.Result, ttl int) {
 				fallthrough
 			case res.Hops[ttl][i].Geo.Asnumber == "9929":
 				fallthrough
+			case res.Hops[ttl][i].Geo.Asnumber == "23764":
+				fallthrough
 			case strings.HasPrefix(res.Hops[ttl][i].Address.String(), "59.43."):
 				fmt.Fprintf(color.Output, " %s", color.New(color.FgHiYellow, color.Bold).Sprintf("AS%-6s", res.Hops[ttl][i].Geo.Asnumber))
 			default:
@@ -102,6 +104,8 @@ func RealtimePrinter(res *trace.Result, ttl int) {
 				fallthrough
 			case res.Hops[ttl][i].Geo.Asnumber == "9929":
 				fallthrough
+			case res.Hops[ttl][i].Geo.Asnumber == "23764":
+				fallthrough
 			case whoisFormat[0] == "[CNC-BACKBONE]":
 				fallthrough
 			case whoisFormat[0] == "[CUG-BACKBONE]":