fix bug: nil pointer dereference

Merge pull request #195 from nxtrace/main
chore: SYNC
2025-08-12 06:26:39 +00:00 · 2023-11-17 19:00:34 +08:00 · 2023-11-17 17:29:46 +08:00 · 2023-11-17 17:26:23 +08:00 · 2023-11-15 10:19:00 +08:00 · 2023-11-13 17:19:05 +08:00
22 changed files with 586 additions and 186 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -17,6 +17,11 @@ copyright: [v2fly](https://github.com/v2fly)
 除非特殊情况，请完整填写所有问题。不按模板发的 issue 将直接被关闭。
 如果你遇到的问题不是 nexttrace 的 bug，比如你不清楚如何配置，请在 https://github.com/nxtrace/NTrace-core/discussions 进行讨论。
 -->
+## 本项目是基于Linux/macOS的，请确认您遇到的问题是否在Linux或macOS上存在。
+
+<!-- 是/否 -->
+<!-- 对于只出现在Windows上的问题，本项目有时无法解决，请知悉 -->
+

 ## 你正在使用哪个版本的 nexttrace？

@@ -39,6 +44,8 @@ copyright: [v2fly](https://github.com/v2fly)

 ## 请附上出错时软件输出的错误信息

+<!-- 是/否 -->
+
 ## 是否查询过本仓库wiki有没有类似错误

-<!-- wiki: https://github.com/sjlleo/nexttrace/wiki -->
+<!-- wiki: https://github.com/nxtrace/NTrace-core/wiki -->
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,6 +75,12 @@ jobs:
            goarch: mipsle
          - goos: linux
            goarch: mips
+          - goos: linux
+            goarch: mipsle
+            gomips: softfloat
+          - goos: linux
+            goarch: mips
+            gomips: softfloat
          # END MIPS
          # BEGIN PPC
          - goos: linux
@@ -104,6 +110,7 @@ jobs:
      GOOS: ${{ matrix.goos }}
      GOARCH: ${{ matrix.goarch }}
      GOARM: ${{ matrix.goarm }}
+      GOMIPS: ${{ matrix.gomips }}
      CGO_ENABLED: 0
    steps:
      - name: Checkout codebase
@@ -117,7 +124,10 @@ jobs:
          if [ "$GOOS" == "windows" ]; then
            export _NAME="$_NAME.exe"
          fi
-          echo "GOOS: $GOOS, GOARCH: $GOARCH, GOARM: $GOARM, RELEASE_NAME: $_NAME"
+          if [ "$GOMIPS" == "softfloat" ]; then
+            export _NAME="${_NAME}_softfolat"
+          fi
+          echo "GOOS: $GOOS, GOARCH: $GOARCH, GOARM: $GOARM, GOMIPS: $GOMIPS, RELEASE_NAME: $_NAME"
          echo "ASSET_NAME=$_NAME" >> $GITHUB_ENV
          echo "BUILD_VERSION=$(git describe --tags --always)" >> $GITHUB_ENV
          echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
--- a/1
+++ b/1
@@ -1 +0,0 @@
-mtr.moe
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ We are extremely grateful to [DMIT](https://dmit.io) and [Misaka](https://misaka

 Document Language: English | [简体中文](README_zh_CN.md)

+⚠️ Please note: We welcome PR submissions from the community, but please submit your PRs to the [NTrace-V1](https://github.com/nxtrace/NTrace-V1) repository instead of [NTrace-core](https://github.com/nxtrace/NTrace-core) repository.<br>
 Regarding the NTrace-V1 and NTrace-core repositories:<br>
 Both will largely remain consistent with each other. All development work is done within the NTrace-V1 repository. The NTrace-V1 repository releases new versions first. After running stably for an undetermined period, we will synchronize that version to NTrace-core. This means that the NTrace-V1 repository serves as a "beta" or "testing" version.<br>
 Please note, there are exceptions to this synchronization. If a version of NTrace-V1 encounters a serious bug, NTrace-core will skip that flawed version and synchronize directly to the next version that resolves the issue.
@@ -119,10 +120,15 @@ Please note, there are exceptions to this synchronization. If a version of NTrac
    After installing Go >= 1.20 yourself, you can use the following command to install

    ```shell
-    go install github.com/nxtrace/Ntrace-V1@latest
+    go install github.com/nxtrace/NTrace-core@latest
    ```
+    *because of the version constraints conflict, you can not install  `NTrace-V1` by this*
    After installation, the executable is in the `$GOPATH/bin` directory. If you have not set `GOPATH`, it is in the `$HOME/go/bin` directory.
-
+    The binary file name is consistent with the project name. You need to replace the `nexttrace` command below with `NTrace-core`.
+     If you want to be consistent with the commands below, you can rename the binary after executing the `go install` command
+    ```shell
+    mv  $GOPATH/bin/NTrace-core $GOPATH/bin/nexttrace
+    ``` 

 ### Get Started

@@ -141,7 +147,7 @@ nexttrace --table 1.0.0.1
 nexttrace --raw 1.0.0.1
 nexttrace --json 1.0.0.1

-# IPv4/IPv6 Resolve Only
+# IPv4/IPv6 Resolve Only, and automatically select the first IP when there are multiple IPs
 nexttrace --ipv4 g.co
 nexttrace --ipv6 g.co

@@ -171,6 +177,17 @@ nexttrace --fast-trace

 # You can also use TCP SYN for testing
 nexttrace --fast-trace --tcp
+
+# You can also quickly test through a customized IP/DOMAIN list file
+nexttrace --file /path/to/your/iplist.txt
+# CUSTOMIZED IP DOMAIN LIST FILE FORMAT
+## One IP/DOMAIN per line + space + description information (optional)
+## forExample:
+## 106.37.67.1 BEIJING-TELECOM
+## 240e:928:101:31a::1 BEIJING-TELECOM
+## bj.10086.cn BEIJING-MOBILE
+## 2409:8080:0:1::1
+## 223.5.5.5
 ```

 `NextTrace` already supports route tracing for specified Network Devices
@@ -210,6 +227,8 @@ nexttrace --parallel-requests 1 www.hkix.net

 # Start Trace with TTL of 5, end at TTL of 10
 nexttrace --first 5 --max-hops 10 www.decix.net
+# In addition, an ENV is provided to set whether to hide the destination IP
+export NEXTTRACE_ENABLEHIDDENDSTIP=1

 # Turn off the IP reverse parsing function
 nexttrace --no-rdns www.bbix.net
@@ -258,8 +277,8 @@ nexttrace --data-provider IPAPI.com --max-hops 20 --tcp --port 443 --queries 5 -
 nexttrace -tcp --queries 2 --parallel-requests 1 --table --route-path 2001:4860:4860::8888

 Equivalent to:
-nexttrace -d IPAPI.com -m 20 -T -p 443 -q 5 -n 1.1.1.1
-nexttrace -T -q 2 --parallel-requests 1 -t -R 2001:4860:4860::8888
+nexttrace -d ip-api.com -m 20 -T -p 443 -q 5 -n 1.1.1.1
+nexttrace -T -q 2 --parallel-requests 1 -t -P 2001:4860:4860::8888
 ```

 ### IP Database
@@ -285,15 +304,16 @@ Usage: nexttrace [-h|--help] [-4|--ipv4] [-6|--ipv6] [-T|--tcp] [-U|--udp]
                 <integer>] [--parallel-requests <integer>] [-m|--max-hops
                 <integer>] [-d|--data-provider
                 (Ip2region|ip2region|IP.SB|ip.sb|IPInfo|ipinfo|IPInsight|ipinsight|IPAPI.com|ip-api.com|IPInfoLocal|ipinfolocal|chunzhen|LeoMoeAPI|leomoeapi|disable-geoip)]
-                 [-n|--no-rdns] [-a|--always-rdns] [-P|--route-path]
-                 [-r|--report] [--dn42] [-o|--output] [-t|--table] [--raw]
-                 [-j|--json] [-c|--classic] [-f|--first <integer>] [-M|--map]
+                 [--pow-provider (api.leo.moe|sakura)] [-n|--no-rdns]
+                 [-a|--always-rdns] [-P|--route-path] [-r|--report] [--dn42]
+                 [-o|--output] [-t|--table] [--raw] [-j|--json] [-c|--classic]
+                 [-f|--first <integer>] [-M|--map] [-e|--disable-mpls]
                 [-v|--version] [-s|--source "<value>"] [-D|--dev "<value>"]
-                 [-R|--route] [-z|--send-time <integer>] [-i|--ttl-time
-                 <integer>] [--timeout <integer>] [--psize <integer>]
-                 [_positionalArg_nexttrace_31 "<value>"] [--dot-server
+                 [-z|--send-time <integer>] [-i|--ttl-time <integer>]
+                 [--timeout <integer>] [--psize <integer>]
+                 [_positionalArg_nexttrace_32 "<value>"] [--dot-server
                 (dnssb|aliyun|dnspod|google|cloudflare)] [-g|--language
-                 (en|cn)]
+                 (en|cn)] [--file "<value>"]

 Arguments:

@@ -350,7 +370,6 @@ Arguments:
  -s  --source                       Use source src_addr for outgoing packets
  -D  --dev                          Use the following Network Devices as the
                                     source address in outgoing packets
-  -R  --route                        Show Routing Table [Provided By BGP.Tools]
  -z  --send-time                    Set how many [milliseconds] between
                                     sending each packet.. Useful when some
                                     routers use rate-limit for ICMP messages.
@@ -364,11 +383,12 @@ Arguments:
                                     connection.. Default: 1000
      --psize                        Set the packet size (payload size).
                                     Default: 52
-      --_positionalArg_nexttrace_31  IP Address or domain name
+      --_positionalArg_nexttrace_32  IP Address or domain name
      --dot-server                   Use DoT Server for DNS Parse [dnssb,
                                     aliyun, dnspod, google, cloudflare]
  -g  --language                     Choose the language for displaying [en,
                                     cn]. Default: cn
+      --file                         Read IP Address or domain name from file
 ```

 ## Project screenshot
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -50,6 +50,7 @@

 Document Language: [English](README.md) | 简体中文

+⚠️ 请注意：我们欢迎来自社区的PR提交，但是请将您的PR提交至 [NTrace-V1](https://github.com/nxtrace/NTrace-V1) 仓库，而不是 [NTrace-core](https://github.com/nxtrace/NTrace-core) 仓库。<br>
 关于NTrace-V1和NTrace-core两个仓库的说明：<br>
 二者将大体上保持一致。所有的开发工作均在NTrace-V1仓库中进行。NTrace-V1仓库首先发布新版本，在稳定运行一段时间后（时长不定），我们会把版本同步至NTrace-core。这意味着NTrace-V1仓库充当了一个“测试版”的角色。<br>
 请注意，版本同步也存在例外。如果NTrace-V1的某个版本出现了严重的bug，NTrace-core会跳过这一有缺陷的版本，直接同步到下一个修复了该问题的版本。
@@ -130,9 +131,16 @@ Document Language: [English](README.md) | 简体中文
    您可在自行安装Go >= 1.20后，使用以下命令安装

    ```shell
-    go install github.com/nxtrace/Ntrace-V1@latest
+    go install github.com/nxtrace/NTrace-core@latest
    ```
-    安装后可执行文件在`$GOPATH/bin`目录下，如果您没有设置`GOPATH`，则在`$HOME/go/bin`目录下。
+    *由于go.mod文件声明和文件目录冲突的问题，你不能用go install命令安装  `NTrace-V1` 版本*
+    安装后可执行文件在`$GOPATH/bin`目录下，如果您没有设置`GOPATH`，则在`$HOME/go/bin`目录下。 
+    安装后二进制文件名称与项目名称保持一致，你需要将下文中的 `nexttrace` 命令替换为 `NTrace-core` 使用
+    如果你希望与下文命令保持一致，可以在执行 `go install` 命令后重命名二进制文件
+
+    ```shell
+    mv  $GOPATH/bin/NTrace-core $GOPATH/bin/nexttrace
+    ``` 


 ### Get Started
@@ -152,7 +160,7 @@ nexttrace --table 1.0.0.1
 nexttrace --raw 1.0.0.1
 nexttrace --json 1.0.0.1

-# 只进行IPv4/IPv6解析
+# 只进行IPv4/IPv6解析，且当多个IP时自动选择第一个IP
 nexttrace --ipv4 g.co
 nexttrace --ipv6 g.co

@@ -182,6 +190,17 @@ nexttrace --fast-trace

 # 也可以使用 TCP SYN 而非 ICMP 进行测试
 nexttrace --fast-trace --tcp
+
+# 也可以通过自定义的IP/DOMAIN列表文件进行快速测试
+nexttrace --file /path/to/your/iplist.txt
+# 自定义的IP/DOMAIN列表文件格式
+## 一行一个IP/DOMAIN + 空格 + 描述信息（可选）
+## 例如：
+## 106.37.67.1 北京电信
+## 240e:928:101:31a::1 北京电信
+## bj.10086.cn 北京移动
+## 2409:8080:0:1::1
+## 223.5.5.5
 ```

 `NextTrace` 已支持指定网卡进行路由跟踪
@@ -224,6 +243,8 @@ nexttrace --parallel-requests 1 www.hkix.net

 # 从TTL为5开始发送探测包，直到TTL为10结束
 nexttrace --first 5 --max-hops 10 www.decix.net
+# 此外还提供了一个ENV，可以设置是否隐匿目的IP
+export NEXTTRACE_ENABLEHIDDENDSTIP=1

 # 关闭IP反向解析功能
 nexttrace --no-rdns www.bbix.net
@@ -272,7 +293,7 @@ nexttrace -tcp --queries 2 --parallel-requests 1 --table --route-path 2001:4860:

 Equivalent to:
 nexttrace -d ip-api.com -m 20 -T -p 443 -q 5 -n 1.1.1.1
-nexttrace -T -q 2 --parallel-requests 1 -t -R 2001:4860:4860::8888
+nexttrace -T -q 2 --parallel-requests 1 -t -P 2001:4860:4860::8888
 ```

 ### 全部用法详见 Usage 菜单
@@ -283,15 +304,16 @@ Usage: nexttrace [-h|--help] [-4|--ipv4] [-6|--ipv6] [-T|--tcp] [-U|--udp]
                 <integer>] [--parallel-requests <integer>] [-m|--max-hops
                 <integer>] [-d|--data-provider
                 (Ip2region|ip2region|IP.SB|ip.sb|IPInfo|ipinfo|IPInsight|ipinsight|IPAPI.com|ip-api.com|IPInfoLocal|ipinfolocal|chunzhen|LeoMoeAPI|leomoeapi|disable-geoip)]
-                 [-n|--no-rdns] [-a|--always-rdns] [-P|--route-path]
-                 [-r|--report] [--dn42] [-o|--output] [-t|--table] [--raw]
-                 [-j|--json] [-c|--classic] [-f|--first <integer>] [-M|--map]
+                 [--pow-provider (api.leo.moe|sakura)] [-n|--no-rdns]
+                 [-a|--always-rdns] [-P|--route-path] [-r|--report] [--dn42]
+                 [-o|--output] [-t|--table] [--raw] [-j|--json] [-c|--classic]
+                 [-f|--first <integer>] [-M|--map] [-e|--disable-mpls]
                 [-v|--version] [-s|--source "<value>"] [-D|--dev "<value>"]
-                 [-R|--route] [-z|--send-time <integer>] [-i|--ttl-time
-                 <integer>] [--timeout <integer>] [--psize <integer>]
-                 [_positionalArg_nexttrace_31 "<value>"] [--dot-server
+                 [-z|--send-time <integer>] [-i|--ttl-time <integer>]
+                 [--timeout <integer>] [--psize <integer>]
+                 [_positionalArg_nexttrace_32 "<value>"] [--dot-server
                 (dnssb|aliyun|dnspod|google|cloudflare)] [-g|--language
-                 (en|cn)]
+                 (en|cn)] [--file "<value>"]

 Arguments:

@@ -348,7 +370,6 @@ Arguments:
  -s  --source                       Use source src_addr for outgoing packets
  -D  --dev                          Use the following Network Devices as the
                                     source address in outgoing packets
-  -R  --route                        Show Routing Table [Provided By BGP.Tools]
  -z  --send-time                    Set how many [milliseconds] between
                                     sending each packet.. Useful when some
                                     routers use rate-limit for ICMP messages.
@@ -362,11 +383,12 @@ Arguments:
                                     connection.. Default: 1000
      --psize                        Set the packet size (payload size).
                                     Default: 52
-      --_positionalArg_nexttrace_31  IP Address or domain name
+      --_positionalArg_nexttrace_32  IP Address or domain name
      --dot-server                   Use DoT Server for DNS Parse [dnssb,
                                     aliyun, dnspod, google, cloudflare]
  -g  --language                     Choose the language for displaying [en,
                                     cn]. Default: cn
+      --file                         Read IP Address or domain name from file
 ```

 ## 项目截图
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -59,7 +59,7 @@ func Excute() {
 	ver := parser.Flag("v", "version", &argparse.Options{Help: "Print version info and exit"})
 	srcAddr := parser.String("s", "source", &argparse.Options{Help: "Use source src_addr for outgoing packets"})
 	srcDev := parser.String("D", "dev", &argparse.Options{Help: "Use the following Network Devices as the source address in outgoing packets"})
-	router := parser.Flag("R", "route", &argparse.Options{Help: "Show Routing Table [Provided By BGP.Tools]"})
+	//router := parser.Flag("R", "route", &argparse.Options{Help: "Show Routing Table [Provided By BGP.Tools]"})
 	packetInterval := parser.Int("z", "send-time", &argparse.Options{Default: 100, Help: "Set how many [milliseconds] between sending each packet.. Useful when some routers use rate-limit for ICMP messages"})
 	ttlInterval := parser.Int("i", "ttl-time", &argparse.Options{Default: 500, Help: "Set how many [milliseconds] between sending packets groups by TTL. Useful when some routers use rate-limit for ICMP messages"})
 	timeout := parser.Int("", "timeout", &argparse.Options{Default: 1000, Help: "The number of [milliseconds] to keep probe sockets open before giving up on the connection."})
@@ -69,6 +69,7 @@ func Excute() {
 		Help: "Use DoT Server for DNS Parse [dnssb, aliyun, dnspod, google, cloudflare]"})
 	lang := parser.Selector("g", "language", []string{"en", "cn"}, &argparse.Options{Default: "cn",
 		Help: "Choose the language for displaying [en, cn]"})
+	file := parser.String("", "file", &argparse.Options{Help: "Read IP Address or domain name from file"})

 	err := parser.Parse(os.Args)
 	if err != nil {
@@ -91,7 +92,7 @@ func Excute() {
 		*port = 80
 	}

-	if *fast_trace {
+	if *fast_trace || *file != "" {
 		var paramsFastTrace = fastTrace.ParamsFastTrace{
 			SrcDev:         *srcDev,
 			SrcAddr:        *srcAddr,
@@ -102,6 +103,7 @@ func Excute() {
 			Lang:           *lang,
 			PktSize:        *packetSize,
 			Timeout:        time.Duration(*timeout) * time.Millisecond,
+			File:           *file,
 		}

 		fastTrace.FastTest(*tcp, *output, paramsFastTrace)
@@ -119,7 +121,12 @@ func Excute() {
 	}

 	if strings.Contains(domain, "/") {
-		domain = strings.Split(domain, "/")[2]
+		parts := strings.Split(domain, "/")
+		if len(parts) < 3 {
+			fmt.Println("Invalid input")
+			return
+		}
+		domain = parts[2]
 	}

 	if strings.Contains(domain, "]") {
@@ -176,21 +183,26 @@ func Excute() {
 	//
 	//go func() {
 	//	defer wg.Done()
+	err = nil
 	if *udp {
 		if *ipv6Only {
 			fmt.Println("[Info] IPv6 UDP Traceroute is not supported right now.")
 			os.Exit(0)
 		}
-		ip = util.DomainLookUp(domain, "4", *dot, *jsonPrint)
+		ip, err = util.DomainLookUp(domain, "4", *dot, *jsonPrint)
 	} else {
 		if *ipv6Only {
-			ip = util.DomainLookUp(domain, "6", *dot, *jsonPrint)
+			ip, err = util.DomainLookUp(domain, "6", *dot, *jsonPrint)
 		} else if *ipv4Only {
-			ip = util.DomainLookUp(domain, "4", *dot, *jsonPrint)
+			ip, err = util.DomainLookUp(domain, "4", *dot, *jsonPrint)
 		} else {
-			ip = util.DomainLookUp(domain, "all", *dot, *jsonPrint)
+			ip, err = util.DomainLookUp(domain, "all", *dot, *jsonPrint)
 		}
 	}
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
 	//}()
 	//
 	//wg.Wait()
@@ -218,7 +230,7 @@ func Excute() {
 		printer.PrintTraceRouteNav(ip, domain, *dataOrigin, *maxHops, *packetSize)
 	}

-	var m trace.Method = ""
+	var m trace.Method

 	switch {
 	case *tcp:
@@ -233,6 +245,7 @@ func Excute() {
 		*port = 53
 	}

+	util.DestIP = ip.String()
 	var conf = trace.Config{
 		DN42:             *dn42,
 		SrcAddr:          *srcAddr,
@@ -252,6 +265,9 @@ func Excute() {
 		PktSize:          *packetSize,
 	}

+	// 暂时弃用
+	router := new(bool)
+	*router = false
 	if !*tablePrint {
 		if *classicPrint {
 			conf.RealtimePrinter = printer.ClassicPrinter
--- a/fast_trace/fast_trace
+++ b/fast_trace/fast_trace
@@ -13,45 +13,49 @@ import (
 	"os/signal"
 )

-var pFastTracer ParamsFastTrace
+//var pFastTracer ParamsFastTrace

 func (f *FastTracer) tracert_v6(location string, ispCollection ISPCollection) {
-	fp, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
-	if err != nil {
-		return
-	}
-	defer func(fp *os.File) {
-		err := fp.Close()
-		if err != nil {
-			log.Fatal(err)
-		}
-	}(fp)
-
-	log.SetOutput(fp)
-	log.SetFlags(0)
 	fmt.Printf("%s『%s %s 』%s\n", printer.YELLOW_PREFIX, location, ispCollection.ISPName, printer.RESET_PREFIX)
-	log.Printf("『%s %s 』\n", location, ispCollection.ISPName)
-	fmt.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IPv6, pFastTracer.MaxHops, pFastTracer.PktSize)
-	log.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IPv6, pFastTracer.MaxHops, pFastTracer.PktSize)
-	ip := util.DomainLookUp(ispCollection.IPv6, "6", "", true)
+	fmt.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IPv6, f.ParamsFastTrace.MaxHops, f.ParamsFastTrace.PktSize)
+
+	ip, err := util.DomainLookUp(ispCollection.IPv6, "6", "", true)
+	if err != nil {
+		log.Fatal(err)
+	}
 	var conf = trace.Config{
-		BeginHop:         pFastTracer.BeginHop,
+		BeginHop:         f.ParamsFastTrace.BeginHop,
 		DestIP:           ip,
 		DestPort:         80,
-		MaxHops:          pFastTracer.MaxHops,
+		MaxHops:          f.ParamsFastTrace.MaxHops,
 		NumMeasurements:  3,
 		ParallelRequests: 18,
-		RDns:             pFastTracer.RDns,
-		AlwaysWaitRDNS:   pFastTracer.AlwaysWaitRDNS,
+		RDns:             f.ParamsFastTrace.RDns,
+		AlwaysWaitRDNS:   f.ParamsFastTrace.AlwaysWaitRDNS,
 		PacketInterval:   100,
 		TTLInterval:      500,
 		IPGeoSource:      ipgeo.GetSource("LeoMoeAPI"),
-		Timeout:          pFastTracer.Timeout,
-		PktSize:          pFastTracer.PktSize,
-		Lang:             pFastTracer.Lang,
+		Timeout:          f.ParamsFastTrace.Timeout,
+		SrcAddr:          f.ParamsFastTrace.SrcAddr,
+		PktSize:          f.ParamsFastTrace.PktSize,
+		Lang:             f.ParamsFastTrace.Lang,
 	}

 	if oe {
+		fp, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
+		if err != nil {
+			return
+		}
+		defer func(fp *os.File) {
+			err := fp.Close()
+			if err != nil {
+				log.Fatal(err)
+			}
+		}(fp)
+		log.SetOutput(fp)
+		log.SetFlags(0)
+		log.Printf("『%s %s 』\n", location, ispCollection.ISPName)
+		log.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IPv6, f.ParamsFastTrace.MaxHops, f.ParamsFastTrace.PktSize)
 		conf.RealtimePrinter = tracelog.RealtimePrinter
 	} else {
 		conf.RealtimePrinter = printer.RealtimePrinter
@@ -63,7 +67,7 @@ func (f *FastTracer) tracert_v6(location string, ispCollection ISPCollection) {
 		log.Fatal(err)
 	}

-	println()
+	fmt.Println()
 }

 func (f *FastTracer) testAll_v6() {
@@ -114,7 +118,6 @@ func FastTestv6(tm bool, outEnable bool, paramsFastTrace ParamsFastTrace) {
 	var c string

 	oe = outEnable
-	pFastTracer = paramsFastTrace

 	fmt.Println("您想测试哪些ISP的路由？\n1. 国内四网\n2. 电信\n3. 联通\n4. 移动\n5. 教育网\n6. 全部")
 	fmt.Print("请选择选项：")
@@ -123,7 +126,9 @@ func FastTestv6(tm bool, outEnable bool, paramsFastTrace ParamsFastTrace) {
 		c = "1"
 	}

-	ft := FastTracer{}
+	ft := FastTracer{
+		ParamsFastTrace: paramsFastTrace,
+	}

 	// 建立 WebSocket 连接
 	w := wshandle.New()
--- a/fast_trace/fast_trace.go
+++ b/fast_trace/fast_trace.go
@@ -1,6 +1,7 @@
 package fastTrace

 import (
+	"bufio"
 	"fmt"
 	"github.com/nxtrace/NTrace-core/ipgeo"
 	"github.com/nxtrace/NTrace-core/printer"
@@ -12,6 +13,7 @@ import (
 	"net"
 	"os"
 	"os/signal"
+	"strings"
 	"time"
 )

@@ -30,29 +32,25 @@ type ParamsFastTrace struct {
 	Lang           string
 	PktSize        int
 	Timeout        time.Duration
+	File           string
+}
+
+type IpListElement struct {
+	Ip       string
+	Desc     string
+	Version4 bool // true for IPv4, false for IPv6
 }

 var oe = false

 func (f *FastTracer) tracert(location string, ispCollection ISPCollection) {
-	fp, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
-	if err != nil {
-		return
-	}
-	defer func(fp *os.File) {
-		err := fp.Close()
-		if err != nil {
-			log.Fatal(err)
-		}
-	}(fp)
-
-	log.SetOutput(fp)
-	log.SetFlags(0)
 	fmt.Printf("%s『%s %s 』%s\n", printer.YELLOW_PREFIX, location, ispCollection.ISPName, printer.RESET_PREFIX)
-	log.Printf("『%s %s 』\n", location, ispCollection.ISPName)
 	fmt.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IP, f.ParamsFastTrace.MaxHops, f.ParamsFastTrace.PktSize)
-	log.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IP, f.ParamsFastTrace.MaxHops, f.ParamsFastTrace.PktSize)
-	ip := util.DomainLookUp(ispCollection.IP, "4", "", true)
+
+	ip, err := util.DomainLookUp(ispCollection.IP, "4", "", true)
+	if err != nil {
+		log.Fatal(err)
+	}
 	var conf = trace.Config{
 		BeginHop:         f.ParamsFastTrace.BeginHop,
 		DestIP:           ip,
@@ -72,6 +70,21 @@ func (f *FastTracer) tracert(location string, ispCollection ISPCollection) {
 	}

 	if oe {
+		fp, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
+		if err != nil {
+			return
+		}
+		defer func(fp *os.File) {
+			err := fp.Close()
+			if err != nil {
+				log.Fatal(err)
+			}
+		}(fp)
+
+		log.SetOutput(fp)
+		log.SetFlags(0)
+		log.Printf("『%s %s 』\n", location, ispCollection.ISPName)
+		log.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IP, f.ParamsFastTrace.MaxHops, f.ParamsFastTrace.PktSize)
 		conf.RealtimePrinter = tracelog.RealtimePrinter
 	} else {
 		conf.RealtimePrinter = printer.RealtimePrinter
@@ -82,13 +95,19 @@ func (f *FastTracer) tracert(location string, ispCollection ISPCollection) {
 	if err != nil {
 		log.Fatal(err)
 	}
-	println()
+	fmt.Println()
 }

 func FastTest(tm bool, outEnable bool, paramsFastTrace ParamsFastTrace) {
+	// tm means tcp mode
 	var c string
-	pFastTrace := paramsFastTrace
 	oe = outEnable
+
+	if paramsFastTrace.File != "" {
+		testFile(paramsFastTrace, tm)
+		return
+	}
+
 	fmt.Println("Hi，欢迎使用 Fast Trace 功能，请注意 Fast Trace 功能只适合新手使用\n因为国内网络复杂，我们设置的测试目标有限，建议普通用户自测以获得更加精准的路由情况")
 	fmt.Println("请您选择要测试的 IP 类型\n1. IPv4\n2. IPv6")
 	fmt.Print("请选择选项：")
@@ -97,16 +116,41 @@ func FastTest(tm bool, outEnable bool, paramsFastTrace ParamsFastTrace) {
 		c = "1"
 	}
 	if c == "2" {
+		if paramsFastTrace.SrcDev != "" {
+			dev, _ := net.InterfaceByName(paramsFastTrace.SrcDev)
+			if addrs, err := dev.Addrs(); err == nil {
+				for _, addr := range addrs {
+					if (addr.(*net.IPNet).IP.To4() == nil) == true {
+						paramsFastTrace.SrcAddr = addr.(*net.IPNet).IP.String()
+						// 检查是否是内网IP
+						if !(net.ParseIP(paramsFastTrace.SrcAddr).IsPrivate() ||
+							net.ParseIP(paramsFastTrace.SrcAddr).IsLoopback() ||
+							net.ParseIP(paramsFastTrace.SrcAddr).IsLinkLocalUnicast() ||
+							net.ParseIP(paramsFastTrace.SrcAddr).IsLinkLocalMulticast()) {
+							// 若不是则跳出
+							break
+						}
+					}
+				}
+			}
+		}
 		FastTestv6(tm, outEnable, paramsFastTrace)
 		return
 	}
-
-	if pFastTrace.SrcDev != "" {
-		dev, _ := net.InterfaceByName(pFastTrace.SrcDev)
+	if paramsFastTrace.SrcDev != "" {
+		dev, _ := net.InterfaceByName(paramsFastTrace.SrcDev)
 		if addrs, err := dev.Addrs(); err == nil {
 			for _, addr := range addrs {
-				if addr.(*net.IPNet).IP.To4() != nil {
-					pFastTrace.SrcAddr = addr.(*net.IPNet).IP.String()
+				if (addr.(*net.IPNet).IP.To4() == nil) == false {
+					paramsFastTrace.SrcAddr = addr.(*net.IPNet).IP.String()
+					// 检查是否是内网IP
+					if !(net.ParseIP(paramsFastTrace.SrcAddr).IsPrivate() ||
+						net.ParseIP(paramsFastTrace.SrcAddr).IsLoopback() ||
+						net.ParseIP(paramsFastTrace.SrcAddr).IsLinkLocalUnicast() ||
+						net.ParseIP(paramsFastTrace.SrcAddr).IsLinkLocalMulticast()) {
+						// 若不是则跳出
+						break
+					}
 				}
 			}
 		}
@@ -120,7 +164,7 @@ func FastTest(tm bool, outEnable bool, paramsFastTrace ParamsFastTrace) {
 	}

 	ft := FastTracer{
-		ParamsFastTrace: pFastTrace,
+		ParamsFastTrace: paramsFastTrace,
 	}

 	// 建立 WebSocket 连接
@@ -156,6 +200,171 @@ func FastTest(tm bool, outEnable bool, paramsFastTrace ParamsFastTrace) {
 	}
 }

+func testFile(paramsFastTrace ParamsFastTrace, tm bool) {
+	// 建立 WebSocket 连接
+	w := wshandle.New()
+	w.Interrupt = make(chan os.Signal, 1)
+	signal.Notify(w.Interrupt, os.Interrupt)
+	defer func() {
+		w.Conn.Close()
+	}()
+
+	var tracerouteMethod trace.Method
+	if !tm {
+		tracerouteMethod = trace.ICMPTrace
+		fmt.Println("您将默认使用ICMP协议进行路由跟踪，如果您想使用TCP SYN进行路由跟踪，可以加入 -T 参数")
+	} else {
+		tracerouteMethod = trace.TCPTrace
+	}
+
+	filePath := paramsFastTrace.File
+	file, err := os.Open(filePath)
+	if err != nil {
+		fmt.Println("Error opening file:", err)
+		return
+	}
+	defer func(file *os.File) {
+		err := file.Close()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}(file)
+	var ipList []IpListElement
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		parts := strings.SplitN(line, " ", 2)
+
+		var ip, desc string
+		if len(parts) == 2 {
+			ip = parts[0]
+			desc = parts[1]
+		} else if len(parts) == 1 {
+			ip = parts[0]
+			desc = ip // Set the description to the IP if no description is provided
+		} else {
+			fmt.Printf("Ignoring invalid line: %s\n", line)
+			continue
+		}
+
+		parsedIP := net.ParseIP(ip)
+		if parsedIP == nil {
+			netIp, err := util.DomainLookUp(ip, "all", "", true)
+			if err != nil {
+				fmt.Printf("Ignoring invalid IP: %s\n", ip)
+				continue
+			}
+			if len(parts) == 1 {
+				desc = ip
+			}
+			ip = netIp.String()
+		}
+
+		ipElem := IpListElement{
+			Ip:       ip,
+			Desc:     desc,
+			Version4: strings.Contains(ip, "."),
+		}
+
+		ipList = append(ipList, ipElem)
+	}
+
+	if err := scanner.Err(); err != nil {
+		fmt.Println("Error reading file:", err)
+	}
+
+	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)
+		var srcAddr string
+		if ip.Version4 {
+			if paramsFastTrace.SrcDev != "" {
+				dev, _ := net.InterfaceByName(paramsFastTrace.SrcDev)
+				if addrs, err := dev.Addrs(); err == nil {
+					for _, addr := range addrs {
+						if (addr.(*net.IPNet).IP.To4() == nil) == false {
+							srcAddr = addr.(*net.IPNet).IP.String()
+							// 检查是否是内网IP
+							if !(net.ParseIP(srcAddr).IsPrivate() ||
+								net.ParseIP(srcAddr).IsLoopback() ||
+								net.ParseIP(srcAddr).IsLinkLocalUnicast() ||
+								net.ParseIP(srcAddr).IsLinkLocalMulticast()) {
+								// 若不是则跳出
+								break
+							}
+						}
+					}
+				}
+			}
+		} else {
+			if paramsFastTrace.SrcDev != "" {
+				dev, _ := net.InterfaceByName(paramsFastTrace.SrcDev)
+				if addrs, err := dev.Addrs(); err == nil {
+					for _, addr := range addrs {
+						if (addr.(*net.IPNet).IP.To4() == nil) == true {
+							srcAddr = addr.(*net.IPNet).IP.String()
+							// 检查是否是内网IP
+							if !(net.ParseIP(srcAddr).IsPrivate() ||
+								net.ParseIP(srcAddr).IsLoopback() ||
+								net.ParseIP(srcAddr).IsLinkLocalUnicast() ||
+								net.ParseIP(srcAddr).IsLinkLocalMulticast()) {
+								// 若不是则跳出
+								break
+							}
+						}
+					}
+				}
+			}
+		}
+
+		var conf = trace.Config{
+			BeginHop:         paramsFastTrace.BeginHop,
+			DestIP:           net.ParseIP(ip.Ip),
+			DestPort:         80,
+			MaxHops:          paramsFastTrace.MaxHops,
+			NumMeasurements:  3,
+			ParallelRequests: 18,
+			RDns:             paramsFastTrace.RDns,
+			AlwaysWaitRDNS:   paramsFastTrace.AlwaysWaitRDNS,
+			PacketInterval:   100,
+			TTLInterval:      500,
+			IPGeoSource:      ipgeo.GetSource("LeoMoeAPI"),
+			Timeout:          paramsFastTrace.Timeout,
+			SrcAddr:          srcAddr,
+			PktSize:          paramsFastTrace.PktSize,
+			Lang:             paramsFastTrace.Lang,
+		}
+
+		if oe {
+			fp, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
+			if err != nil {
+				return
+			}
+			defer func(fp *os.File) {
+				err := fp.Close()
+				if err != nil {
+					log.Fatal(err)
+				}
+			}(fp)
+
+			log.SetOutput(fp)
+			log.SetFlags(0)
+			log.Printf("『%s』\n", ip.Desc)
+			log.Printf("traceroute to %s, %d hops max, %d byte packets\n", ip.Ip, paramsFastTrace.MaxHops, paramsFastTrace.PktSize)
+			conf.RealtimePrinter = tracelog.RealtimePrinter
+		} else {
+			conf.RealtimePrinter = printer.RealtimePrinter
+		}
+
+		_, err := trace.Traceroute(tracerouteMethod, conf)
+		if err != nil {
+			log.Fatalln(err)
+		}
+		fmt.Println()
+	}
+
+}
+
 func (f *FastTracer) testAll() {
 	f.testCT()
 	println()
--- a/go.mod
+++ b/go.mod
@@ -10,17 +10,17 @@ require (
 	github.com/stretchr/testify v1.8.4
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
 	github.com/tsosunchia/powclient v0.1.4
-	golang.org/x/net v0.17.0
-	golang.org/x/sync v0.4.0
+	golang.org/x/net v0.18.0
+	golang.org/x/sync v0.5.0
 )

 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -32,19 +32,19 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
+	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )

 require (
-	github.com/fatih/color v1.15.0
-	github.com/gorilla/websocket v1.5.0
+	github.com/fatih/color v1.16.0
+	github.com/gorilla/websocket v1.5.1
 	github.com/lionsoul2014/ip2region v2.11.2+incompatible
 	github.com/rodaine/table v1.1.0
 	github.com/tidwall/gjson v1.17.0
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
-	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -58,12 +58,12 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
-github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
+github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
 github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -125,8 +125,8 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
+github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
@@ -151,8 +151,8 @@ github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3v
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -239,8 +239,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
+golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -296,8 +296,8 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
+golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -317,8 +317,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
-golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -355,10 +355,9 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -368,8 +367,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
--- a/printer/basic.go
+++ b/printer/basic.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/nxtrace/NTrace-core/config"
 	"github.com/nxtrace/NTrace-core/trace"
+	"github.com/nxtrace/NTrace-core/util"
 	"net"

 	"github.com/fatih/color"
@@ -23,45 +24,48 @@ func Version() {
 }

 func CopyRight() {
-	fmt.Fprintf(color.Output, "\n%s\n%s\n%s %s\n\n%s\n%s %s\n%s %s\n%s %s\n\n%s\n%s\n%s %s\n\n",
-		color.New(color.FgCyan, color.Bold).Sprintf("%s", "NextTrace CopyRight"),
-		color.New(color.FgGreen, color.Bold).Sprintf("%s", "NextTrace Project Creator"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Leo"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@leo.moe"),
-		color.New(color.FgGreen, color.Bold).Sprintf("%s", "NextTrace Project Maintainer"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Tso"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "tsosunchia@gmail.com"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Vincent"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@vincent.moe"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Leo"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@leo.moe"),
-		color.New(color.FgCyan, color.Bold).Sprintf("%s", "Special Acknowledgement List"),
-		color.New(color.FgGreen, color.Bold).Sprintf("%s", "NextTrace Major Contributor"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "zhshch"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "zhshch@athorx.com"),
-	)
-
-	moeQingOrgCopyRight()
 	sponsor()
+	fmt.Fprintf(color.Output, "\n%s\n%s %s\n%s %s\n%s %s, %s, %s, %s\n%s %s\n%s %s\n",
+		color.New(color.FgCyan, color.Bold).Sprintf("%s", "NextTrace CopyRight"),
+		//color.New(color.FgGreen, color.Bold).Sprintf("%s", "Contact Us"),
+		//color.New(color.FgWhite, color.Bold).Sprintf("%s", "Feedback Email:"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "nt@moeqing.com"),
+		//color.New(color.FgWhite, color.Bold).Sprintf("%s", "HomePage:"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "github.com/nxtrace"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Honorary Founder:"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Leo"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@leo.moe"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Project Chair:"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Tso"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Core-Developer:"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Leo"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@leo.moe"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Vincent"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@vincent.moe"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "zhshch"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "zhshch@athorx.com"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Tso"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "tsosunchia@gmail.com"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Infra Maintainer:"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Tso"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "NOC Manager:"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "YekongTAT"),
+		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "tsosunchia@gmail.com"),
+	)
 	//PluginCopyRight()
 }

-func moeQingOrgCopyRight() {
-	fmt.Fprintf(color.Output, "%s\n%s %s\n%s %s\n\n",
-		color.New(color.FgGreen, color.Bold).Sprintf("%s", "Supported by MoeQing Network"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "YekongTAT"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "yekongtat@gmail.com"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Haima"),
-		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "haima@peers.cloud"),
-	)
-}
-
 func sponsor() {
-	fmt.Fprintf(color.Output, "%s\n%s\n%s\n%s\n",
-		color.New(color.FgGreen, color.Bold).Sprintf("%s", "Sponsored by the following entities"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "DMIT.io"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Misaka.io"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Skywolf.cloud"),
+	italic := "\x1b[3m%s\x1b[0m"
+	formatted := fmt.Sprintf(italic, "(Listed in no particular order)")
+
+	fmt.Fprintf(color.Output, "%s\n%s\n%s\n%s\n%s\n%s\n",
+		color.New(color.FgCyan, color.Bold).Sprintf("%s", "NextTrace Sponsored by"),
+		color.New(color.FgHiYellow, color.Bold).Sprintf("%s", "· DMIT.io"),
+		color.New(color.FgHiYellow, color.Bold).Sprintf("%s", "· Misaka.io"),
+		color.New(color.FgHiYellow, color.Bold).Sprintf("%s", "· Skywolf.cloud"),
+		color.New(color.FgHiYellow, color.Bold).Sprintf("%s", "· MoeQing.io"),
+		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", formatted),
 	)
 }

@@ -75,11 +79,14 @@ func sponsor() {

 func PrintTraceRouteNav(ip net.IP, domain string, dataOrigin string, maxHops int, packetSize int) {
 	fmt.Println("IP Geo Data Provider: " + dataOrigin)
-
-	if ip.String() == domain {
-		fmt.Printf("traceroute to %s, %d hops max, %d bytes packets\n", ip.String(), maxHops, packetSize)
+	if util.EnableHidDstIP == "" {
+		if ip.String() == domain {
+			fmt.Printf("traceroute to %s, %d hops max, %d bytes packets\n", ip.String(), maxHops, packetSize)
+		} else {
+			fmt.Printf("traceroute to %s (%s), %d hops max, %d bytes packets\n", ip.String(), domain, maxHops, packetSize)
+		}
 	} else {
-		fmt.Printf("traceroute to %s (%s), %d hops max, %d bytes packets\n", ip.String(), domain, maxHops, packetSize)
+		fmt.Printf("traceroute to %s, %d hops max, %d bytes packets\n", util.HideIPPart(ip.String()), maxHops, packetSize)
 	}
 }

--- a/printer/realtime_printer.go
+++ b/printer/realtime_printer.go
@@ -2,6 +2,7 @@ package printer

 import (
 	"fmt"
+	"github.com/nxtrace/NTrace-core/util"
 	"net"
 	"strconv"
 	"strings"
@@ -12,7 +13,6 @@ import (

 func RealtimePrinter(res *trace.Result, ttl int) {
 	fmt.Printf("%s  ", color.New(color.FgHiYellow, color.Bold).Sprintf("%-2d", ttl+1))
-
 	// 去重
 	var latestIP string
 	tmpMap := make(map[string][]string)
@@ -51,13 +51,25 @@ func RealtimePrinter(res *trace.Result, ttl int) {
 			fmt.Printf("%4s", "")
 		}
 		if net.ParseIP(ip).To4() == nil {
-			fmt.Fprintf(color.Output, "%s",
-				color.New(color.FgWhite, color.Bold).Sprintf("%-25s", ip),
-			)
+			if util.EnableHidDstIP == "" || ip != util.DestIP {
+				fmt.Fprintf(color.Output, "%s",
+					color.New(color.FgWhite, color.Bold).Sprintf("%-25s", ip),
+				)
+			} else {
+				fmt.Fprintf(color.Output, "%s",
+					color.New(color.FgWhite, color.Bold).Sprintf("%-25s", util.HideIPPart(ip)),
+				)
+			}
 		} else {
-			fmt.Fprintf(color.Output, "%s",
-				color.New(color.FgWhite, color.Bold).Sprintf("%-15s", ip),
-			)
+			if util.EnableHidDstIP == "" || ip != util.DestIP {
+				fmt.Fprintf(color.Output, "%s",
+					color.New(color.FgWhite, color.Bold).Sprintf("%-15s", ip),
+				)
+			} else {
+				fmt.Fprintf(color.Output, "%s",
+					color.New(color.FgWhite, color.Bold).Sprintf("%-15s", util.HideIPPart(ip)),
+				)
+			}
 		}

 		i, _ := strconv.Atoi(v[0])
--- a/trace/icmp_ipv4.go
+++ b/trace/icmp_ipv4.go
@@ -15,6 +15,8 @@ import (
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv4"
+
+	"github.com/nxtrace/NTrace-core/trace/internal"
 )

 type ICMPTracer struct {
@@ -39,6 +41,7 @@ func (t *ICMPTracer) PrintFunc() {
 		if t.AsyncPrinter != nil {
 			t.AsyncPrinter(&t.res)
 		}
+		// 接收的时候检查一下是不是 3 跳都齐了
 		if len(t.res.Hops)-1 > ttl {
 			if len(t.res.Hops[ttl]) == t.NumMeasurements {
 				if t.RealtimePrinter != nil {
@@ -66,7 +69,7 @@ func (t *ICMPTracer) Execute() (*Result, error) {

 	var err error

-	t.icmpListen, err = net.ListenPacket("ip4:1", t.SrcAddr)
+	t.icmpListen, err = internal.ListenICMP("ip4:1", t.SrcAddr)
 	if err != nil {
 		return &t.res, err
 	}
@@ -164,6 +167,9 @@ func (t *ICMPTracer) listenICMP() {
 							t.handleICMPMessage(msg, 0, rm.Body.(*icmp.TimeExceeded).Data, int(ttl))
 						case ipv4.ICMPTypeEchoReply:
 							t.handleICMPMessage(msg, 1, rm.Body.(*icmp.Echo).Data, int(ttl))
+						//unreachable
+						case ipv4.ICMPTypeDestinationUnreachable:
+							t.handleICMPMessage(msg, 2, rm.Body.(*icmp.DstUnreach).Data, int(ttl))
 						default:
 							// log.Println("received icmp message of unknown type", rm.Type)
 						}
@@ -176,6 +182,12 @@ func (t *ICMPTracer) listenICMP() {
 }

 func (t *ICMPTracer) handleICMPMessage(msg ReceivedMessage, icmpType int8, data []byte, ttl int) {
+	if icmpType == 2 {
+		if t.DestIP.String() != msg.Peer.String() {
+			return
+		}
+	}
+
 	t.inflightRequestRWLock.RLock()
 	defer t.inflightRequestRWLock.RUnlock()

--- a/trace/icmp_ipv6.go
+++ b/trace/icmp_ipv6.go
@@ -13,6 +13,8 @@ import (
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv6"
+
+	"github.com/nxtrace/NTrace-core/trace/internal"
 )

 type ICMPTracerv6 struct {
@@ -30,7 +32,7 @@ type ICMPTracerv6 struct {
 }

 func (t *ICMPTracerv6) PrintFunc() {
-	// defer t.wg.Done()
+	defer t.wg.Done()
 	var ttl = t.Config.BeginHop - 1
 	for {
 		if t.AsyncPrinter != nil {
@@ -44,12 +46,12 @@ func (t *ICMPTracerv6) PrintFunc() {
 					t.RealtimePrinter(&t.res, ttl)
 				}
 				ttl++
-				if ttl == t.final {
+
+				if ttl == t.final-1 || ttl >= t.MaxHops-1 {
 					return
 				}
 			}
 		}
-
 		<-time.After(200 * time.Millisecond)
 	}
 }
@@ -65,7 +67,7 @@ func (t *ICMPTracerv6) Execute() (*Result, error) {

 	var err error

-	t.icmpListen, err = net.ListenPacket("ip6:58", t.SrcAddr)
+	t.icmpListen, err = internal.ListenICMP("ip6:58", t.SrcAddr)
 	if err != nil {
 		return &t.res, err
 	}
@@ -78,6 +80,7 @@ func (t *ICMPTracerv6) Execute() (*Result, error) {
 	t.final = -1

 	go t.listenICMP()
+	t.wg.Add(1)
 	go t.PrintFunc()
 	for ttl := t.BeginHop; ttl <= t.MaxHops; ttl++ {
 		t.inflightRequestRWLock.Lock()
@@ -189,6 +192,8 @@ func (t *ICMPTracerv6) listenICMP() {
 							t.handleICMPMessage(msg, 0, rm.Body.(*icmp.TimeExceeded).Data, int(ttl))
 						case ipv6.ICMPTypeEchoReply:
 							t.handleICMPMessage(msg, 1, rm.Body.(*icmp.Echo).Data, int(ttl))
+						case ipv6.ICMPTypeDestinationUnreachable:
+							t.handleICMPMessage(msg, 2, rm.Body.(*icmp.DstUnreach).Data, int(ttl))
 						default:
 							// log.Println("received icmp message of unknown type", rm.Type)
 						}
@@ -232,6 +237,11 @@ func (t *ICMPTracerv6) listenICMP() {
 }

 func (t *ICMPTracerv6) handleICMPMessage(msg ReceivedMessage, icmpType int8, data []byte, ttl int) {
+	if icmpType == 2 {
+		if t.DestIP.String() != msg.Peer.String() {
+			return
+		}
+	}
 	t.inflightRequestRWLock.RLock()
 	defer t.inflightRequestRWLock.RUnlock()

--- a/trace/internal/icmp_darwin.go
+++ b/trace/internal/icmp_darwin.go
@@ -12,13 +12,14 @@ import (
 )

 //go:linkname internetSocket net.internetSocket
-func internetSocket(ctx context.Context, net string, laddr, raddr interface{}, sotype, proto int, mode string, ctrlCtxFn func(context.Context, string, string, syscall.RawConn) error) (fd unsafe.Pointer, err error)
+func internetSocket(ctx context.Context, net string, laddr, raddr any, sotype, proto int, mode string, ctrlCtxFn func(context.Context, string, string, syscall.RawConn) error) (fd unsafe.Pointer, err error)

 //go:linkname newIPConn net.newIPConn
 func newIPConn(fd unsafe.Pointer) *net.IPConn

 var (
 	errUnknownNetwork = errors.New("unknown network type")
+	errUnknownIface   = errors.New("unknown network interface")

 	networkMap = map[string]string{
 		"ip4:icmp": "udp4",
@@ -28,7 +29,6 @@ var (
 	}
 )

-// ListenICMP 会造成指定出口IP功能不可使用
 func ListenICMP(network string, laddr string) (net.PacketConn, error) {
 	if os.Getuid() == 0 { // root
 		return net.ListenPacket(network, laddr)
@@ -38,7 +38,48 @@ func ListenICMP(network string, laddr string) (net.PacketConn, error) {
 			if nw == "udp6" {
 				proto = syscall.IPPROTO_ICMPV6
 			}
-			isock, err := internetSocket(context.Background(), nw, nil, nil, syscall.SOCK_DGRAM, proto, "listen", nil)
+
+			var ifIndex int = -1
+			if laddr != "" {
+				la := net.ParseIP(laddr)
+				if ifaces, err := net.Interfaces(); err == nil {
+					for _, iface := range ifaces {
+						addrs, err := iface.Addrs()
+						if err != nil {
+							continue
+						}
+						for _, addr := range addrs {
+							if ipnet, ok := addr.(*net.IPNet); ok {
+								if ipnet.IP.Equal(la) {
+									ifIndex = iface.Index
+									break
+								}
+							}
+						}
+					}
+					if ifIndex == -1 {
+						return nil, errUnknownIface
+					}
+				} else {
+					return nil, err
+				}
+			}
+
+			isock, err := internetSocket(context.Background(), nw, nil, nil, syscall.SOCK_DGRAM, proto, "listen",
+				func(ctx context.Context, network, address string, c syscall.RawConn) error {
+					if ifIndex != -1 {
+						if proto == syscall.IPPROTO_ICMP {
+							return c.Control(func(fd uintptr) {
+								syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, ifIndex)
+							})
+						} else {
+							return c.Control(func(fd uintptr) {
+								syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, ifIndex)
+							})
+						}
+					}
+					return nil
+				})
 			if err != nil {
 				panic(err)
 			}
--- a/trace/tcp_ipv4.go
+++ b/trace/tcp_ipv4.go
@@ -257,7 +257,7 @@ func (t *TCPTracer) send(ttl int) error {
 	t.inflightRequest[int(sequenceNumber)] = hopCh
 	t.inflightRequestLock.Unlock()
 	/*
-		// 这里属于 2个Sender，N个Reciever的情况，在哪里关闭Channel都容易导致Panic
+		// 这里属于 2个Sender，N个Receiver的情况，在哪里关闭Channel都容易导致Panic
 		defer func() {
 			t.inflightRequestLock.Lock()
 			close(hopCh)
--- a/trace/trace.go
+++ b/trace/trace.go
@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"syscall"
 	"time"

 	"github.com/nxtrace/NTrace-core/ipgeo"
@@ -92,7 +93,11 @@ func Traceroute(method Method, config Config) (*Result, error) {
 	default:
 		return &Result{}, ErrInvalidMethod
 	}
-	return tracer.Execute()
+	result, err := tracer.Execute()
+	if err != nil && errors.Is(err, syscall.EPERM) {
+		err = fmt.Errorf("%w, please run as root", err)
+	}
+	return result, err
 }

 type Result struct {
@@ -141,7 +146,7 @@ func (h *Hop) fetchIPData(c Config) (err error) {
 			h.Hostname = r[0][:len(r[0])-1]
 			ip = h.Address.String() + "," + h.Hostname
 		}
-		h.Geo, err = c.IPGeoSource(ip, c.Timeout, c.Lang, c.Maptrace)
+		h.Geo, _ = c.IPGeoSource(ip, c.Timeout, c.Lang, c.Maptrace)
 		return nil
 	}

@@ -221,9 +226,9 @@ func (h *Hop) fetchIPData(c Config) (err error) {
 		selectClose = true
 	}

-	// When Select Close, fetchDoneChan Reciever will also be closed
+	// When Select Close, fetchDoneChan Received will also be closed
 	if selectClose {
-		// New a reciever to prevent channel congestion
+		// New a receiver to prevent channel congestion
 		<-fetchDoneChan
 	}

--- a/tracemap/tracemap.go
+++ b/tracemap/tracemap.go
@@ -19,6 +19,10 @@ func GetMapUrl(r string) (string, error) {
 	fastIp := "api.leo.moe"
 	// 如果 host 是一个 IP 使用默认域名
 	if valid := net.ParseIP(host); valid != nil {
+		fastIp = host
+		if len(strings.Split(fastIp, ":")) > 1 {
+			fastIp = "[" + fastIp + "]"
+		}
 		host = "api.leo.moe"
 	} else {
 		// 默认配置完成，开始寻找最优 IP
--- a/util/dns_test.go
+++ b/util/dns_test.go
@@ -13,8 +13,8 @@ func TestDNS(t *testing.T) {
 }

 func TestDomainLookUp(t *testing.T) {
-	ips := DomainLookUp("pek-4134.nexttrace-io-fasttrace-endpoint.win.", "all", "", false)
+	ips, _ := DomainLookUp("pek-4134.nexttrace-io-fasttrace-endpoint.win.", "all", "", false)
 	fmt.Println(ips)
-	ips = DomainLookUp("pek-4134.nexttrace-io-fasttrace-endpoint.win.", "4", "", false)
+	ips, _ = DomainLookUp("pek-4134.nexttrace-io-fasttrace-endpoint.win.", "4", "", false)
 	fmt.Println(ips)
 }
--- a/util/latency.go
+++ b/util/latency.go
@@ -60,7 +60,7 @@ func GetFastIP(domain string, port string, enableOutput bool) string {

 	//if len(ips) > 0 {
 	if enableOutput {
-		_, _ = fmt.Fprintf(color.Output, "%s prefered API IP - %s - %s - %s",
+		_, _ = fmt.Fprintf(color.Output, "%s preferred API IP - %s - %s - %s",
 			color.New(color.FgWhite, color.Bold).Sprintf("[NextTrace API]"),
 			color.New(color.FgGreen, color.Bold).Sprintf("%s", result.IP),
 			color.New(color.FgCyan, color.Bold).Sprintf("%sms", result.Latency),
--- a/util/util.go
+++ b/util/util.go
@@ -2,6 +2,7 @@ package util

 import (
 	"context"
+	"errors"
 	"fmt"
 	"github.com/nxtrace/NTrace-core/config"
 	"log"
@@ -21,6 +22,8 @@ var UserAgent = fmt.Sprintf("NextTrace %s/%s/%s", config.Version, runtime.GOOS,
 var RdnsCache sync.Map
 var PowProviderParam = ""
 var DisableMPLS = GetenvDefault("NEXTTRACE_DISABLEMPLS", "")
+var EnableHidDstIP = GetenvDefault("NEXTTRACE_ENABLEHIDDENDSTIP", "")
+var DestIP string

 func LookupAddr(addr string) ([]string, error) {
 	// 如果在缓存中找到，直接返回
@@ -75,7 +78,7 @@ func LocalIPPortv6(dstip net.IP) (net.IP, int) {
 	return nil, -1
 }

-func DomainLookUp(host string, ipVersion string, dotServer string, disableOutput bool) net.IP {
+func DomainLookUp(host string, ipVersion string, dotServer string, disableOutput bool) (net.IP, error) {
 	// ipVersion: 4, 6, all
 	var (
 		r   *net.Resolver
@@ -101,8 +104,7 @@ func DomainLookUp(host string, ipVersion string, dotServer string, disableOutput
 		ips = append(ips, net.ParseIP(v))
 	}
 	if err != nil {
-		fmt.Println("Domain " + host + " Lookup Fail.")
-		os.Exit(1)
+		return nil, errors.New("DNS lookup failed")
 	}

 	//var ipv6Flag = false
@@ -119,16 +121,18 @@ func DomainLookUp(host string, ipVersion string, dotServer string, disableOutput
 		var filteredIPs []net.IP
 		for _, ip := range ips {
 			if ipVersion == "4" && ip.To4() != nil {
-				filteredIPs = append(filteredIPs, ip)
+				filteredIPs = []net.IP{ip}
+				break
 			} else if ipVersion == "6" && strings.Contains(ip.String(), ":") {
-				filteredIPs = append(filteredIPs, ip)
+				filteredIPs = []net.IP{ip}
+				break
 			}
 		}
 		ips = filteredIPs
 	}

 	if (len(ips) == 1) || (disableOutput) {
-		return ips[0]
+		return ips[0], nil
 	} else {
 		fmt.Println("Please Choose the IP You Want To TraceRoute")
 		for i, ip := range ips {
@@ -147,7 +151,7 @@ func DomainLookUp(host string, ipVersion string, dotServer string, disableOutput
 			fmt.Println("Your Option is invalid")
 			os.Exit(3)
 		}
-		return ips[index]
+		return ips[index], nil
 	}
 }

@@ -224,3 +228,17 @@ func StringInSlice(val string, list []string) bool {
 	}
 	return false
 }
+
+func HideIPPart(ip string) string {
+	parsedIP := net.ParseIP(ip)
+	if parsedIP == nil {
+		return ""
+	}
+
+	if parsedIP.To4() != nil {
+		// IPv4: 隐藏后16位
+		return strings.Join(strings.Split(ip, ".")[:2], ".") + ".0.0/16"
+	}
+	// IPv6: 隐藏后96位
+	return parsedIP.Mask(net.CIDRMask(32, 128)).String() + "/32"
+}
--- a/wshandle/client.go
+++ b/wshandle/client.go
@@ -10,6 +10,7 @@ import (
 	"net/url"
 	"os"
 	"os/signal"
+	"strings"
 	"sync"
 	"time"

@@ -188,6 +189,9 @@ func createWsConn() *WsConn {
 	// 如果 host 是一个 IP 使用默认域名
 	if valid := net.ParseIP(host); valid != nil {
 		fastIp = host
+		if len(strings.Split(fastIp, ":")) > 1 {
+			fastIp = "[" + fastIp + "]"
+		}
 		host = "api.leo.moe"
 	} else {
 		// 默认配置完成，开始寻找最优 IP
Author	SHA1	Message	Date
tsosunchia	4bef8b918a	fix bug: nil pointer dereference	2023-11-17 19:00:34 +08:00
tsosunchia	690f7346d0	Merge pull request #195 from nxtrace/main chore: SYNC	2023-11-17 17:29:46 +08:00
tsosunchia	d82a521954	Update bug_report.md	2023-11-17 17:26:23 +08:00
tsosunchia	0b7d01fb21	移除route参数	2023-11-15 10:19:00 +08:00
tsosunchia	2fed1d152f	chore: 更新依赖	2023-11-13 17:19:05 +08:00
tsosunchia	98c0fa38ca	可设置是否隐匿目的IP	2023-11-13 11:23:07 +08:00
tsosunchia	cb63e9b61c	Merge pull request #22 from fakeboboliu/main add source ip support to macOS rootless solution	2023-11-12 00:20:18 +08:00
bobo liu	e4626c4f82	notice silver-bullet of permission issue	2023-11-12 00:11:11 +08:00
bobo liu	47698be2ed	add source ip support for macOS rootless solution do you guys not have macos devices?	2023-11-11 21:38:28 +08:00
tsosunchia	ee0ebb126c	Delete CNAME	2023-11-10 09:53:54 +08:00
tsosunchia	1b59210eb1	Merge pull request #191 from nxtrace/main chore: SYNC	2023-11-09 16:31:25 +08:00
tsosunchia	ed518d175b	Merge pull request #21 from huiming23344/main docs: Clarify the steps in the installation guide	2023-11-09 16:29:07 +08:00
Huiming	9f67ea5e9b	docs: Clarify the steps in the installation guide	2023-11-09 15:33:47 +08:00
tsosunchia	d98d2f7ee5	chore(deps): bump golang.org/x/text from 0.13.0 to 0.14.0	2023-11-08 16:17:07 +08:00
tsosunchia	e0b874a687	增加异常处理，在用户输入错误时	2023-11-08 16:13:59 +08:00
tsosunchia	b39657ca5b	Merge pull request #20 from nxtrace/dependabot/go_modules/github.com/fatih/color-1.16.0 chore(deps): bump github.com/fatih/color from 1.15.0 to 1.16.0	2023-11-07 08:28:47 +08:00
dependabot[bot]	c79387ff75	chore(deps): bump github.com/fatih/color from 1.15.0 to 1.16.0 Bumps [github.com/fatih/color](https://github.com/fatih/color) from 1.15.0 to 1.16.0. - [Release notes](https://github.com/fatih/color/releases) - [Commits](https://github.com/fatih/color/compare/v1.15.0...v1.16.0) --- updated-dependencies: - dependency-name: github.com/fatih/color dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-11-07 00:25:23 +00:00
tsosunchia	e6b2d975b4	Merge pull request #19 from nxtrace/dependabot/go_modules/github.com/gorilla/websocket-1.5.1 chore(deps): bump github.com/gorilla/websocket from 1.5.0 to 1.5.1	2023-11-07 08:24:45 +08:00
tsosunchia	33c1af9f50	Merge pull request #18 from nxtrace/dependabot/go_modules/golang.org/x/sync-0.5.0 chore(deps): bump golang.org/x/sync from 0.4.0 to 0.5.0	2023-11-07 08:23:38 +08:00
dependabot[bot]	da825c18cc	chore(deps): bump github.com/gorilla/websocket from 1.5.0 to 1.5.1 Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.5.0 to 1.5.1. - [Release notes](https://github.com/gorilla/websocket/releases) - [Commits](https://github.com/gorilla/websocket/compare/v1.5.0...v1.5.1) --- updated-dependencies: - dependency-name: github.com/gorilla/websocket dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-11-06 14:57:48 +00:00
dependabot[bot]	4adba2b59d	chore(deps): bump golang.org/x/sync from 0.4.0 to 0.5.0 Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.4.0 to 0.5.0. - [Commits](https://github.com/golang/sync/compare/v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-11-06 14:57:44 +00:00
tsosunchia	65d8ac5c14	修改credit	2023-11-05 16:16:59 +08:00
tsosunchia	7472398c26	Merge pull request #186 from nxtrace/main chore: 同步	2023-11-05 15:41:12 +08:00
tsosunchia	b2870a823f	修改默认行为，当指定v4/v6时自动选择第一个IP方便脚本使用	2023-11-03 01:21:53 +08:00
tsosunchia	f82af5f9c5	ipv6 trace 正序输出	2023-11-03 00:47:42 +08:00
tsosunchia	9eda2d2a30	chore: 更新依赖	2023-10-31 04:03:50 +08:00
tsosunchia	1a4a15eb74	修复使用NEXTTRACE_HOSTPORT环境变量时不支持IPv6反代地址的问题	2023-10-31 04:03:32 +08:00
tsosunchia	f5556fea5d	Merge pull request #184 from nxtrace/main chore: sync	2023-10-27 21:16:42 +08:00
tsosunchia	d760e75810	fix bug: 当接收到由自身发出的DestinationUnreachable包时视为有效信息，此增强由 @XQZR 提出。	2023-10-20 00:46:58 +08:00
tsosunchia	99409089b2	update credit	2023-10-14 22:32:12 +08:00
tsosunchia	2040497d89	Merge pull request #182 from nxtrace/main chore: 同步至v1.2.3	2023-10-14 15:18:22 +08:00
tsosunchia	29ce61b24b	更新readme	2023-10-14 09:21:05 +08:00
tsosunchia	701abc3447	增加file参数支持文件读取列表进行路由测试	2023-10-14 09:08:29 +08:00
tsosunchia	f08778c862	修正部分typo	2023-10-13 18:34:14 +08:00
tsosunchia	8697325193	Merge pull request #17 from 1-1-2/softfloat add mips softfloat & mipsle softfloat	2023-10-13 18:03:21 +08:00
1-1-2	32b0f15e78	add mips softfloat & mipsle softfloat	2023-10-13 16:46:20 +08:00
tsosunchia	90e349eeed	Merge pull request #181 from nxtrace/main 更新readme	2023-10-13 10:49:48 +08:00
tsosunchia	f275edba3a	更新readme	2023-10-13 10:49:20 +08:00