From cbc511f0975421fa3fb395998db6b63adf79d0ba Mon Sep 17 00:00:00 2001
From: tsosunchia <59512455+tsosunchia@users.noreply.github.com>
Date: Sun, 31 Mar 2024 12:40:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AF=B9=E4=BA=8EFASTTRACE?=
 =?UTF-8?q?/TESTFILE=E5=8A=9F=E8=83=BD=E5=BA=94=E7=94=A8NO=5FCOLOR?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=EF=BC=8C=E5=AF=B9=E4=BA=8ETESTFILE=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8IP=E9=9A=90=E5=8C=BF=E5=8A=9F=E8=83=BD=E3=80=82=20=09?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20fast=5Ftrace/fast=5Ft?=
 =?UTF-8?q?race.go?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fast_trace/fast_trace.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/fast_trace/fast_trace.go b/fast_trace/fast_trace.go
index 31d18c6..f1558a1 100644
--- a/fast_trace/fast_trace.go
+++ b/fast_trace/fast_trace.go
@@ -3,6 +3,7 @@ package fastTrace
 import (
 	"bufio"
 	"fmt"
+	"github.com/fatih/color"
 	"github.com/nxtrace/NTrace-core/ipgeo"
 	"github.com/nxtrace/NTrace-core/printer"
 	"github.com/nxtrace/NTrace-core/trace"
@@ -44,7 +45,10 @@ type IpListElement struct {
 var oe = false
 
 func (f *FastTracer) tracert(location string, ispCollection ISPCollection) {
-	fmt.Printf("%s『%s %s 』%s\n", printer.YELLOW_PREFIX, location, ispCollection.ISPName, printer.RESET_PREFIX)
+	//fmt.Printf("%s『%s %s 』%s\n", printer.YELLOW_PREFIX, location, ispCollection.ISPName, printer.RESET_PREFIX)
+	fmt.Fprintf(color.Output, "%s\n",
+		color.New(color.FgYellow, color.Bold).Sprint("『 "+location+ispCollection.ISPName+" 』"),
+	)
 	fmt.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IP, f.ParamsFastTrace.MaxHops, f.ParamsFastTrace.PktSize)
 
 	ip, err := util.DomainLookUp(ispCollection.IP, "4", "", true)
@@ -274,8 +278,14 @@ func testFile(paramsFastTrace ParamsFastTrace, tm bool) {
 	}
 
 	for _, ip := range ipList {
-		fmt.Printf("%s『%s』%s\n", printer.YELLOW_PREFIX, ip.Desc, printer.RESET_PREFIX)
-		fmt.Printf("traceroute to %s, %d hops max, %d byte packets\n", ip.Ip, paramsFastTrace.MaxHops, paramsFastTrace.PktSize)
+		fmt.Fprintf(color.Output, "%s\n",
+			color.New(color.FgYellow, color.Bold).Sprint("『 "+ip.Desc+"』"),
+		)
+		if util.EnableHidDstIP == "" {
+			fmt.Printf("traceroute to %s, %d hops max, %d bytes packets\n", ip.Ip, paramsFastTrace.MaxHops, paramsFastTrace.PktSize)
+		} else {
+			fmt.Printf("traceroute to %s, %d hops max, %d bytes packets\n", util.HideIPPart(ip.Ip), paramsFastTrace.MaxHops, paramsFastTrace.PktSize)
+		}
 		var srcAddr string
 		if ip.Version4 {
 			if paramsFastTrace.SrcDev != "" {