update: 允许参数后置

Merge pull request #17 from tsosunchia/main
修改部分提示内容
2025-08-12 06:26:39 +00:00 · 2022-05-27 10:26:32 +08:00 · 2022-05-27 10:20:57 +08:00 · 2022-05-27 10:19:40 +08:00 · 2022-05-27 10:19:25 +08:00 · 2022-05-27 10:12:59 +08:00
36 changed files with 1931 additions and 261 deletions
--- a/.cross_compile.sh
+++ b/.cross_compile.sh
@@ -5,7 +5,11 @@ set -e
 DIST_PREFIX="nexttrace"
 DEBUG_MODE=${2}
 TARGET_DIR="dist"
-PLATFORMS="darwin/amd64 darwin/arm64 linux/amd64 linux/arm64"
+PLATFORMS="darwin/amd64 darwin/arm64 linux/amd64 linux/arm64 linux/mips"
+
+BUILD_VERSION="$(git describe --tags --always)"
+BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+COMMIT_SHA1="$(git rev-parse --short HEAD)"

 rm -rf ${TARGET_DIR}
 mkdir ${TARGET_DIR}
@@ -21,15 +25,15 @@ for pl in ${PLATFORMS}; do
    echo "build => ${TARGET}"
    if [ "${DEBUG_MODE}" == "debug" ]; then
        go build -trimpath -gcflags "all=-N -l" -o ${TARGET} \
-            -ldflags    "-X 'main.version=${BUILD_VERSION}' \
-                        -X 'main.buildDate=${BUILD_DATE}' \
-                        -X 'main.commitID=${COMMIT_SHA1}'\
+            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
+                        -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
+                        -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
                        -w -s"
    else
        go build -trimpath -o ${TARGET} \
-            -ldflags    "-X 'main.version=${BUILD_VERSION}' \
-                        -X 'main.buildDate=${BUILD_DATE}' \
-                        -X 'main.commitID=${COMMIT_SHA1}'\
+            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
+                        -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
+                        -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
                        -w -s"
    fi
 done
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+---
+name: nexttrace 程序问题
+about: "提交一个 nexttrace 的程序问题报告。"
+copyright: [v2fly](https://github.com/v2fly)
+---
+
+<!--
+除非特殊情况，请完整填写所有问题。不按模板发的 issue 将直接被关闭。
+如果你遇到的问题不是 nexttrace 的 bug，比如你不清楚如何配置，请在 https://github.com/xgadget-lab/nexttrace/discussions 进行讨论。
+-->
+
+## 你正在使用哪个版本的 nexttrace？
+
+<!-- 比如linux_amd64 macOS_arm64 -->
+
+
+## 你看到的异常现象是什么？
+
+<!-- 请描述具体现象 -->
+
+
+## 你期待看到的正常表现是怎样的？
+
+
+
+## 请附上你的命令
+
+<!-- 提交 issue 前，请隐去您的隐私信息 -->
+
+
+## 请附上出错时软件输出的错误信息
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,17 +1,31 @@
 on:
-  push: # 每次带有 tag 的 push 候触发
-    tags:
-      - 'v*'
+  push:
+  pull_request:

-name: Build Release
+name: Test & Build Release
 jobs:
-  release:
+  Test:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@master # checkout 代码
-      - uses: actions/setup-go@v2 # 配置 Go 环境
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-go@v2
        with:
-          go-version: "1.18" # 改成自己的版本
+          go-version: "1.18"
+
+      - name: Test
+        run: go test -v -coverprofile='coverage.out' -covermode=count ./...
+
+  Build:
+    needs: test
+    if: startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-go@v2
+        with:
+          go-version: "1.18"

      - run: bash .cross_compile.sh

@@ -24,5 +38,6 @@ jobs:
            dist/nexttrace_darwin_arm64
            dist/nexttrace_linux_amd64
            dist/nexttrace_linux_arm64
+            dist/nexttrace_linux_mips
        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GT_Token }}
--- a/README.md
+++ b/README.md
@@ -1,18 +1,128 @@
+<div align="center">
+
+<img src="asset/logo.png" height="200px" alt="NextTrace Logo"/>
+
+</div>
+
 # NextTrace

-可视化路由跟踪工具
+一款开源的可视化路由跟踪工具，使用 Golang 开发。

 ## How To Use

+### Automated Install
+
+```bash
+#下载nt_install.sh
+curl -Ls https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh -O
+#执行nt_install.sh
+sudo bash nt_install.sh
+```
+
+### Alternative methods
+
+如果你的目的只是为了快速测试服务器的到中国内地的线路，没有手动使用 NextTrace 的需求，那么建议你直接使用本仓库的 `quicklytest.sh`
+
+```bash
+#下载quicklytest.sh
+curl -Ls https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh -O
+#执行quicklytest.sh
+sudo bash quicklytest.sh
+```
+
+### Get Started
+
+`NextTrace`默认使用`icmp`协议发起`TraceRoute`请求，该协议同时支持`IPv4`和`IPv6`
+
+```bash
+# IPv4 ICMP Trace
+nexttrace 1.0.0.1
+
+# 表格打印（一次性输出全部跳数，需等待20-40秒）
+nexttrace -table 1.0.0.1
+# 实时打印 (-realtime与-table不能同时选择)
+nexttrace -realtime 1.0.0.1
+
+# IPv6 ICMP Trace
+nexttrace 2606:4700:4700::1111
+```
+
+`NextTrace`也可以使用`TCP`和`UDP`协议发起`Traceroute`请求，不过目前只支持`IPv4`
+
+```bash
+# TCP SYN Trace
+nexttrace -T www.bing.com
+
+# 可以自行指定端口[此处为443]，默认80端口
+nexttrace -T -p 443 1.0.0.1
+
+# UDP Trace
+nexttrace -U 1.0.0.1
+
+nexttrace -U -p 53 1.0.0.1
+```
+
+`NextTrace`也同样支持一些进阶功能，如 IP 反向解析、并发数控制、模式切换等
+
+```bash
+# 每一跳发送2个探测包
+nexttrace -q 2 www.hkix.net
+
+# 无并发，每次只发送一个探测包
+nexttrace -r 1 www.hkix.net
+
+# 打开IP反向解析功能，在IPv6的骨干网定位辅助有较大帮助
+nexttrace -rdns www.bbix.net
+
+# 特色功能：打印Route-Path图
+# Route-Path图示例：
+# AS6453 塔塔通信「Singapore『Singapore』」
+#  ╭╯
+# ╰AS9299 Philippine Long Distance Telephone Co.「Philippines『Metro Manila』」
+# ╭╯
+# ╰AS36776 Five9 Inc.「Philippines『Metro Manila』」
+# ╭╯
+# ╰AS37963 阿里云「ALIDNS.COM『ALIDNS.COM』」
+nexttrace -report www.time.com.my
+```
+
+`NextTrace`支持用户自主选择 IP 数据库（目前支持：`LeoMoeAPI`, `IP.SB`, `IPInfo`, `IPInsight`）
+
+```bash
+# 可以自行指定IP数据库[此处为IP.SB]，不指定则默认为LeoMoeAPI
+nexttrace -d IP.SB
+## 特别的：其中 ipinfo API 需要从ipinfo自行购买服务，如有需要可以clone本项目添加其提供的token自行编译
+##        TOKEN填写路径：ipgeo/tokens.go
+## 另外：由于IP.SB被滥用比较严重，会经常出现无法查询的问题，请知悉。
+```
+
+`NextTrace`目前不支持自定义参数位置，请按标准格式输入命令
+
+```bash
+Example:
+nexttrace -d IPInsight -m 20 -p 443 -q 5 -r 20 -rdns -table 1.1.1.1
+nexttrace -T -q 2 -r 1 -rdns -realtime -report 2001:4860:4860::8888
+```
+
+### IP 数据库
+
+目前使用的 IP 数据库默认为我们自己搭建的 API 服务，如果后期遇到滥用，我们可能会选择关闭。
+
+我们也会在后期开放服务端源代码，您也可以根据该项目的源码自行搭建属于您的 API 服务器。
+
+NextTrace 所有的的 IP 地理位置`API DEMO`可以参考[这里](https://github.com/xgadget-lab/nexttrace/blob/main/ipgeo/)
+
+### 全部用法详见 Usage 菜单
+
 ```shell
-NextTrace v0.1.0 Alpha 
-xgadget-lab zhshch (xzhsh.ch) & leo (leo.moe)
 Usage of nexttrace:
-  -T    Use TCP SYN for tracerouting (default port is 80 in TCP, 53 in UDP)
+      nexttrace [options] <hostname>
+Options:
+  -T    Use TCP SYN for tracerouting (default port is 80)
+  -U    Use UDP Package for tracerouting (default port is 53 in UDP)
+  -V    Check Version
  -d string
        Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight] (default "LeoMoeAPI")
-  -displayMode string
-        Choose The Display Mode [table, classic] (default "table")
  -m int
        Set the max number of hops (max TTL to be reached). (default 30)
  -p int
@@ -23,11 +133,67 @@ Usage of nexttrace:
        Set ParallelRequests number. It should be 1 when there is a multi-routing. (default 18)
  -rdns
        Set whether rDNS will be display
+  -realtime
+        Output trace results in runtime
+  -table
+        Output trace results as table
  -report
-        Auto-Generate a Route-Path Report by Traceroute
+        Route Path
+
 ```

+## 项目截图
+
+![NextTrace Screenshot](asset/screenshot.png)
+
+## FAQ 常见问题
+
+如果你在安装或者使用的时候遇到了问题，我们建议你不要把新建一个 `issue` 作为首选项
+
+或许可以在这里找到答案 -> [前往 Github Wiki](https://github.com/xgadget-lab/nexttrace/wiki/FAQ---%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98%E8%A7%A3%E7%AD%94)
+
+如果在搜索引擎，WiKi 处还是没有解决，可以试试在本项目讨论区交流 -> [前往 Github Discussions](https://github.com/xgadget-lab/nexttrace/discussions)
+
+最终如果你确认遇到的是 BUG、上述方法都不能解决的话，请按照提供好的模版在 Issues 区提出问题 -> [前往 Github Issues](https://github.com/xgadget-lab/nexttrace/issues)
+
 ## Thanks

-Vincent Young (i@yyt.moe)
+[Vincent Young](https://github.com/missuo) (i@yyt.moe)

+[Sam Sam](https://github.com/samleong123) (samsam123@samsam123.name.my)
+
+[waiting4new](https://github.com/waiting4new)、[FFEE_CO](https://github.com/fkx4-p)、[nsnnns](https://github.com/tsosunchia)
+
+## IP Database Copyright
+
+### IPv4 Database
+
+#### China MainLand
+
+- 项目组自行维护 ~ 御三家骨干网数据 ~ 5%
+
+- 埃文科技 Paid Database ~ 95%
+
+**这里有朋友就要问了，为什么不全部使用埃文的付费库？**
+
+埃文的库一直都不是最优选择，IPIP.NET 才是，但是因为他们不对私，所以我们只能选择价格更便宜的埃文库。
+
+埃文家的数据库，在骨干网这块，准度可以说是非常糟糕，作为一款可视化的路由跟踪工具，骨干网的数据库准度非常重要。
+
+所以我们选择了尝试自行去校准一部分骨干网数据，但是由于我们缺乏检测节点以及志愿者，所以这项工作可能会进展的尤其缓慢。
+
+#### WorldWide
+
+- 埃文科技 Paid Database ~ 15%
+
+- IpInfo Free ~ 15%
+
+- IPInSight Free ~ 70%
+
+### IPv6 Database
+
+This product includes IP2Location LITE data available from <a href="https://lite.ip2location.com">https://lite.ip2location.com</a>.
+
+### Others
+
+其他第三方 API 尽管集成在本项目内，但是具体的 TOS 以及 AUP，请详见第三方 API 官网。如遇到 IP 数据错误，也请直接联系他们纠错。
--- a/asset/logo.png
+++ b/asset/logo.png
--- a/asset/screenshot.png
+++ b/asset/screenshot.png
--- a/asset/screenshot_2.png
+++ b/asset/screenshot_2.png
--- a/asset/screenshot_special.png
+++ b/asset/screenshot_special.png
--- a/go.mod
+++ b/go.mod
@@ -5,13 +5,12 @@ go 1.18
 require (
 	github.com/google/gopacket v1.1.19
 	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
+	golang.org/x/sync v0.0.0-20220513210516-0976fa681c29
 )

 require (
 	github.com/mattn/go-colorable v0.1.9 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/panjf2000/ants/v2 v2.5.0 // indirect
-	golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
 )

 require (
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
@@ -12,8 +12,6 @@ github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 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/panjf2000/ants/v2 v2.5.0 h1:1rWGWSnxCsQBga+nQbA4/iY6VMeNoOIAM0ZWh9u3q2Q=
-github.com/panjf2000/ants/v2 v2.5.0/go.mod h1:cU93usDlihJZ5CfRGNDYsiBYvoilLvBF5Qp/BT2GNRE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rodaine/table v1.0.1 h1:U/VwCnUxlVYxw8+NJiLIuCxA/xa6jL38MY3FYysVWWQ=
@@ -51,6 +49,6 @@ golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapK
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/ipgeo/ipgeo.go
+++ b/ipgeo/ipgeo.go
@@ -1,5 +1,9 @@
 package ipgeo

+import (
+	"strings"
+)
+
 type IPGeoData struct {
 	Asnumber string
 	Country  string
@@ -13,12 +17,12 @@ type IPGeoData struct {
 type Source = func(ip string) (*IPGeoData, error)

 func GetSource(s string) Source {
-	switch s {
-	case "LeoMoeAPI":
+	switch strings.ToUpper(s) {
+	case "LEOMOEAPI":
 		return LeoIP
 	case "IP.SB":
 		return IPSB
-	case "IPInsight":
+	case "IPINSIGHT":
 		return IPInSight
 	default:
 		return nil
--- a/ipgeo/ipgeo_test.go
+++ b/ipgeo/ipgeo_test.go
@@ -15,11 +15,12 @@ func TestLeoIP(t *testing.T) {
 }

 func TestIPSB(t *testing.T) {
-	res, err := IPSB("1.1.1.1")
-	assert.Nil(t, err)
-	assert.NotNil(t, res)
-	assert.NotEmpty(t, res.Asnumber)
-	assert.NotEmpty(t, res.Isp)
+	// Not available
+	//res, err := IPSB("1.1.1.1")
+	//assert.Nil(t, err)
+	//assert.NotNil(t, res)
+	//assert.NotEmpty(t, res.Asnumber)
+	//assert.NotEmpty(t, res.Isp)
 }

 func TestIPInfo(t *testing.T) {
--- a/ipgeo/ipsb.go
+++ b/ipgeo/ipsb.go
@@ -2,24 +2,36 @@ package ipgeo

 import (
 	"io/ioutil"
+	"log"
 	"net/http"
+	"os"
+	"time"

 	"github.com/tidwall/gjson"
 )

 func IPSB(ip string) (*IPGeoData, error) {
-	resp, err := http.Get("https://api.ip.sb/geoip/" + ip)
+	url := "https://api.ip.sb/geoip/" + ip
+	client := &http.Client{
+		// 2 秒超时
+		Timeout: 2 * time.Second,
+	}
+	req, _ := http.NewRequest("GET", url, nil)
+	// 设置 UA，ip.sb 默认禁止 go-client User-Agent 的 api 请求
+	req.Header.Set("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:100.0) Gecko/20100101 Firefox/100.0")
+	content, err := client.Do(req)
 	if err != nil {
+		log.Println("api.ip.sb 请求超时(2s)，请切换其他API使用")
 		return nil, err
 	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
+	body, _ := ioutil.ReadAll(content.Body)
 	res := gjson.ParseBytes(body)

+	if res.Get("country").String() == "" {
+		// 什么都拿不到，证明被Cloudflare风控了
+		os.Exit(1)
+	}
+
 	return &IPGeoData{
 		Asnumber: res.Get("asn").String(),
 		Country:  res.Get("country").String(),
--- a/ipgeo/tokens.go
+++ b/ipgeo/tokens.go
@@ -8,6 +8,6 @@ type tokenData struct {

 var token = tokenData{
 	ipinsight: "",
-	ipinfo:    "42764a944dabd0",
+	ipinfo:    "",
 	ipleo:     "NextTraceDemo",
 }
--- a/listener_channel/listener-channel.go
+++ b/listener_channel/listener-channel.go
@@ -1,61 +0,0 @@
-package listener_channel
-
-import (
-	"golang.org/x/net/context"
-	"net"
-	"time"
-)
-
-type ReceivedMessage struct {
-	N    *int
-	Peer net.Addr
-	Msg  []byte
-	Err  error
-}
-
-type ListenerChannel struct {
-	ctx      context.Context
-	cancel   context.CancelFunc
-	Conn     net.PacketConn
-	Messages chan ReceivedMessage
-}
-
-func New(conn net.PacketConn) *ListenerChannel {
-	ctx, cancel := context.WithCancel(context.Background())
-	results := make(chan ReceivedMessage, 50)
-
-	return &ListenerChannel{Conn: conn, ctx: ctx, cancel: cancel, Messages: results}
-}
-
-func (l *ListenerChannel) Start() {
-	for {
-		select {
-		case <-l.ctx.Done():
-			return
-		default:
-		}
-
-		reply := make([]byte, 1500)
-		err := l.Conn.SetReadDeadline(time.Now().Add(2 * time.Second))
-		if err != nil {
-			l.Messages <- ReceivedMessage{Err: err}
-			continue
-		}
-
-		n, peer, err := l.Conn.ReadFrom(reply)
-		if err != nil {
-			l.Messages <- ReceivedMessage{Err: err}
-			continue
-		}
-		l.Messages <- ReceivedMessage{
-			N:    &n,
-			Peer: peer,
-			Err:  nil,
-			Msg:  reply,
-		}
-	}
-}
-
-func (l *ListenerChannel) Stop() {
-	l.cancel()
-}
--- a/main.go
+++ b/main.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"strings"
 	"time"

 	"github.com/xgadget-lab/nexttrace/ipgeo"
@@ -14,40 +15,69 @@ import (
 	"github.com/xgadget-lab/nexttrace/util"
 )

-var tcpSYNFlag = flag.Bool("T", false, "Use TCP SYN for tracerouting (default port is 80 in TCP, 53 in UDP)")
-var port = flag.Int("p", 80, "Set SYN Traceroute Port")
-var numMeasurements = flag.Int("q", 3, "Set the number of probes per each hop.")
-var parallelRequests = flag.Int("r", 18, "Set ParallelRequests number. It should be 1 when there is a multi-routing.")
-var maxHops = flag.Int("m", 30, "Set the max number of hops (max TTL to be reached).")
-var dataOrigin = flag.String("d", "LeoMoeAPI", "Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight]")
-var displayMode = flag.String("displayMode", "table", "Choose The Display Mode [table, classic]")
-var rdnsenable = flag.Bool("rdns", false, "Set whether rDNS will be display")
-var routePath = flag.Bool("report", false, "Route Path")
+var fSet = flag.NewFlagSet("", flag.ExitOnError)
+var tcpSYNFlag = fSet.Bool("T", false, "Use TCP SYN for tracerouting (default port is 80)")
+var udpPackageFlag = fSet.Bool("U", false, "Use UDP Package for tracerouting (default port is 53 in UDP)")
+var port = fSet.Int("p", -1, "Set SYN Traceroute Port")
+var numMeasurements = fSet.Int("q", 3, "Set the number of probes per each hop.")
+var parallelRequests = fSet.Int("r", 18, "Set ParallelRequests number. It should be 1 when there is a multi-routing.")
+var maxHops = fSet.Int("m", 30, "Set the max number of hops (max TTL to be reached).")
+var dataOrigin = fSet.String("d", "LeoMoeAPI", "Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight]")
+var rdnsenable = fSet.Bool("rdns", false, "Set whether rDNS will be display")
+var routePath = fSet.Bool("report", false, "Route Path")
+var realtimePrint = fSet.Bool("realtime", false, "Output trace results in runtime")
+var tablePrint = fSet.Bool("table", false, "Output trace results as table")
+var ver = fSet.Bool("V", false, "Check Version")
+
+func printArgHelp() {
+	fmt.Println("\nArgs Error\nUsage : 'nexttrace [option...] <hostname>' or 'nexttrace <hostname> [option...]'")
+	fSet.PrintDefaults()
+	os.Exit(2)
+}

 func flagApply() string {
-	flag.Parse()
-	ipArg := flag.Args()
-	if flag.NArg() != 1 {
-		fmt.Println("Args Error\nUsage : ./nexttrace [-T] [-rdns] [-displayMode <displayMode>] [-d <dataOrigin> ] [ -m <hops> ] [ -p <port> ] [ -q <probes> ] [ -r <parallelrequests> ] <hostname>")
-		os.Exit(2)
+	printer.Version()
+
+	target := ""
+	if len(os.Args) < 2 {
+		printArgHelp()
 	}
-	return ipArg[0]
+	if !strings.HasPrefix(os.Args[1], "-") {
+		target = os.Args[1]
+		fSet.Parse(os.Args[2:])
+	} else {
+		fSet.Parse(os.Args[1:])
+		target = fSet.Arg(0)
+	}
+	if *ver {
+		os.Exit(0)
+	}
+	if target == "" {
+		printArgHelp()
+	}
+	return target
 }

 func main() {
+
+	domain := flagApply()
+
 	if os.Getuid() != 0 {
 		log.Fatalln("Traceroute requires root/sudo privileges.")
 	}

-	domain := flagApply()
 	ip := util.DomainLookUp(domain)
 	printer.PrintTraceRouteNav(ip, domain, *dataOrigin)

 	var m trace.Method = ""
-	if *tcpSYNFlag {
+
+	switch {
+	case *tcpSYNFlag:
 		m = trace.TCPTrace
-	} else {
+	case *udpPackageFlag:
 		m = trace.UDPTrace
+	default:
+		m = trace.ICMPTrace
 	}

 	if !*tcpSYNFlag && *port == 80 {
@@ -63,8 +93,10 @@ func main() {
 		RDns:             *rdnsenable,
 		IPGeoSource:      ipgeo.GetSource(*dataOrigin),
 		Timeout:          2 * time.Second,
+	}

-		//Quic:    false,
+	if m == trace.ICMPTrace && !*tablePrint {
+		conf.RealtimePrinter = printer.RealtimePrinter
 	}

 	res, err := trace.Traceroute(m, conf)
@@ -74,14 +106,24 @@ func main() {
 	}

 	if *routePath {
+		// 如果为TCP SYN，也打印路由跟踪结果
+		if *tcpSYNFlag {
+			printer.TracerouteTablePrinter(res)
+		}
 		r := reporter.New(res, ip.String())
 		r.Print()
 		return
 	}

-	if *displayMode == "table" {
+	if m == trace.ICMPTrace && *tablePrint {
 		printer.TracerouteTablePrinter(res)
-	} else {
-		printer.TraceroutePrinter(res)
+	}
+
+	if m == trace.TCPTrace || m == trace.UDPTrace {
+		if *realtimePrint {
+			printer.TraceroutePrinter(res)
+		} else {
+			printer.TracerouteTablePrinter(res)
+		}
 	}
 }
--- a/nt_install.sh
+++ b/nt_install.sh
@@ -0,0 +1,268 @@
+#!/bin/bash
+
+auto=False
+#是否忽略一切警告，按默认执行
+if [[ $1 == "--auto" ]]; then
+    auto=True
+    echo "自动运行中"
+fi
+
+usrPath="/usr/local/bin"
+
+function red(){
+    echo -e "\e[1;31m$1\e[0m"
+}
+
+checkRootPermit() {
+    [[ $EUID -ne 0 ]] && red "请使用sudo/root权限运行本脚本" && exit 1
+}
+ask_if()
+{
+    local choice=""
+    while [ "$choice" != "y" ] && [ "$choice" != "n" ]
+    do
+        red $1
+        read choice
+    done
+    [ $choice == y ] && return 0
+    return 1
+}
+#检查脚本更新
+check_script_update()
+{
+    [ "$(md5sum "${BASH_SOURCE[0]}" | awk '{print $1}')" == "$(md5sum <(curl -sL "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh") | awk '{print $1}')" ] && return 1 || return 0
+}
+#更新脚本
+update_script()
+{
+    if curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh" || curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh"; then
+        red "脚本更新完成，正在重启脚本..."
+        exec bash ${BASH_SOURCE[0]} --auto
+    else
+        red "更新脚本失败！"
+        exit 1
+    fi
+}
+ask_update_script()
+{
+    if check_script_update; then
+        red "脚本可升级"
+        [[ $auto == True ]] && update_script
+        ask_if "是否升级脚本？(y/n)" && update_script
+    else
+        red "脚本已经是最新版本"
+    fi
+}
+checkSystemArch() {
+    arch=$(uname -m)
+    case $arch in
+      'x86_64')
+        archParam='amd64'
+        ;;
+      'mips')
+        archParam='mips'
+        ;;
+      'arm64'|'aarch64')
+        archParam="arm64"
+        ;;
+      *)
+        red "未知的系统架构，请联系开发者."
+        exit 1
+        ;;
+    esac
+}
+
+checkSystemDistribution() {
+    case "$OSTYPE" in
+    darwin*)
+        osDistribution="darwin"
+        downPath="/var/tmp/nexttrace"
+        ;;
+    linux*)
+        osDistribution="linux"
+        downPath="/var/tmp/nexttrace"
+        ;;
+    *)
+        red "unknown: $OSTYPE"
+        exit 1
+        ;;
+    esac
+}
+
+getLocation() {
+    red "正在获取地理位置信息..."
+    countryCode=$(curl -s "http://ip-api.com/line/?fields=countryCode")
+}
+
+checkPackageManger() {
+    if [[ "$(which brew)" ]]; then #务必将brew置于第一位,macOS的apt是假的
+    brew update
+      PACKAGE_MANAGEMENT_INSTALL='brew install'
+      PACKAGE_MANAGEMENT_REMOVE='brew uninstall'
+    elif [[ "$(which apt)" ]]; then
+       apt-get update
+      PACKAGE_MANAGEMENT_INSTALL='apt-get -y --no-install-recommends install'
+      PACKAGE_MANAGEMENT_REMOVE='apt-get purge'
+    elif [[ "$(which dnf)" ]]; then
+    dnf check-update
+      PACKAGE_MANAGEMENT_INSTALL='dnf -y install'
+      PACKAGE_MANAGEMENT_REMOVE='dnf remove'
+    elif [[ "$(which yum)" ]]; then
+      PACKAGE_MANAGEMENT_INSTALL='yum -y install'
+      PACKAGE_MANAGEMENT_REMOVE='yum remove'
+    elif [[ "$(which zypper)" ]]; then
+    zypper refresh
+      PACKAGE_MANAGEMENT_INSTALL='zypper install -y --no-recommends'
+      PACKAGE_MANAGEMENT_REMOVE='zypper remove'
+    elif [[ "$(which pacman)" ]]; then
+      PACKAGE_MANAGEMENT_INSTALL='pacman -Syu --noconfirm'
+      PACKAGE_MANAGEMENT_REMOVE='pacman -Rsn'
+    else
+      red "error: The script does not support the package manager in this operating system."
+      exit 1
+    fi
+}
+
+install_software() {
+  package_name="$1"
+  which "$package_name" > /dev/null 2>&1 && return
+  red "${package_name} 正在安装中...(此步骤时间可能较长，请耐心等待)"
+  if ${PACKAGE_MANAGEMENT_INSTALL} "$package_name"; then
+    red "info: $package_name is installed."
+  else
+    red "error: Installation of $package_name failed, please check your network."
+    exit 1
+  fi
+}
+
+checkVersion() {
+    nexttrace -h &>/dev/null
+    if [ $? -ne 0 ]; then
+        return 0
+    fi
+    red "正在检查版本..."
+    version=$(curl -sL https://api.github.com/repos/xgadget-lab/nexttrace/releases/latest | jq -r '.tag_name')
+    if [[ $version == "" ]]; then
+        red "获取版本失败，请检查网络连接"
+        exit 1
+    fi
+    currentVersion=$(nexttrace -V | head -n 1 | awk '{print $2}') &> /dev/null
+    if [[ $currentVersion == $version ]]; then
+        red "当前版本已是最新版本"
+        exit 0
+    fi
+    red 当前最新release版本：${version}
+    red 您当前的版本：${currentVersion}
+    if [[ $auto == True ]]; then
+        return 0
+    fi
+    read -r -p "是否更新软件? (y/n)" input
+    case $input in
+    [yY][eE][sS] | [yY])
+        return 0
+        ;;
+    [nN][oO] | [nN])
+        red "您选择了取消更新，脚本即将退出"
+        exit 1
+        ;;
+    *)
+        return 0
+        ;;
+    esac
+}
+
+downloadBinrayFile() {
+    red "正在获取最新版的 NextTrace 发行版文件信息..."
+    # 简单说明一下，Github提供了一个API，可以获取最新发行版本的二进制文件下载地址（对应的是browser_download_url），根据刚刚测得的osDistribution、archParam，获取对应的下载地址
+        # red nexttrace_${osDistribution}_${archParam}
+        latestURL=$(curl -s https://api.github.com/repos/xgadget-lab/nexttrace/releases/latest | jq ".assets[] | select(.name == \"nexttrace_${osDistribution}_${archParam}\") | .browser_download_url")
+        latestURL=${latestURL:1:-1}
+    if [ "$countryCode" == "CN" ]; then
+        if [[ $auto == True ]]; then
+            latestURL="https://ghproxy.com/"$latestURL
+        else
+            read -r -p "检测到国内网络环境，是否使用镜像下载以加速(y/n)" input
+            case $input in
+            [yY][eE][sS] | [yY])
+                latestURL="https://ghproxy.com/"$latestURL
+                ;;
+
+            [nN][oO] | [nN])
+                red "您选择了不使用镜像，下载可能会变得异常缓慢，或者失败"
+                ;;
+
+            *)
+                latestURL="https://ghproxy.com/"$latestURL
+                ;;
+            esac
+        fi
+    fi
+
+    red "正在下载 NextTrace 二进制文件..."
+    wget -O ${downPath} ${latestURL} &>/dev/null
+    if [ $? -eq 0 ]; then
+        red "NextTrace 现在已经在您的系统中可用"
+        changeMode
+        mv ${downPath} ${usrPath}
+    else
+        red "NextTrace 下载失败，请检查您的网络是否正常"
+        exit 1
+    fi
+}
+
+changeMode() {
+    chmod +x ${downPath} &>/dev/null
+    [[ ${osDistribution} == "darwin" ]] && xattr -r -d com.apple.quarantine ${downPath}
+}
+
+runBinrayFileHelp() {
+    if [ -e ${usrPath} ]; then
+        ${usrPath}/nexttrace -h
+    fi
+    red "You may need to execute a command to remove dependent software: $PACKAGE_MANAGEMENT_REMOVE wget jq"
+}
+
+addCronTask() {
+    read -r -p "是否添加自动更新任务？(y/n)" input
+    case $input in
+    [yY][eE][sS] | [yY])
+        if [[ ${osDistribution} == "darwin" ]]; then
+            crontab -l >crontab.bak 2>/dev/null
+            sed -i '' '/nt_install.sh/d' crontab.bak
+        elif [[ ${osDistribution} == "linux" ]]; then
+            crontab -l >crontab.bak 2>/dev/null
+            sed -i '/nt_install.sh/d' crontab.bak
+        else
+            red "暂不支持您的系统,无法自动添加crontab任务"
+            return 0
+        fi
+        echo "1 1 * * * $(dirname $(readlink -f "$0"))/nt_install.sh --auto >> /var/log/nt_install.log" >>crontab.bak
+        crontab crontab.bak
+        rm -f crontab.bak
+        ;;
+    [nN][oO] | [nN])
+        red "您选择了不添加自动更新任务，您也可以通过命令 再次执行此脚本 手动更新"
+        ;;
+    *)
+        red "您选择了不添加自动更新任务，您可以通过命令 再次执行此脚本 手动更新"
+        ;;
+    esac
+}
+
+# Check Procedure
+checkRootPermit
+ask_update_script
+checkSystemDistribution
+checkSystemArch
+checkPackageManger
+install_software wget
+install_software jq
+checkVersion
+
+# Download Procedure
+getLocation
+downloadBinrayFile
+
+# Run Procedure
+runBinrayFileHelp
+[[ $auto != True ]] && addCronTask
--- a/printer/basic.go
+++ b/printer/basic.go
@@ -5,8 +5,13 @@ import (
 	"net"
 )

-func PrintCopyRight() {
-	fmt.Println("NextTrace v0.1.0 Alpha \nxgadget-lab zhshch (xzhsh.ch) & leo (leo.moe)")
+var version = "v0.0.0.alpha"
+var buildDate = ""
+var commitID = ""
+
+func Version() {
+	fmt.Println("NextTrace", version, buildDate, commitID)
+	fmt.Println("XGadget-lab Leo (leo.moe) & Vincent (vincent.moe) & zhshch (xzhsh.ch)")
 }

 func PrintTraceRouteNav(ip net.IP, domain string, dataOrigin string) {
--- a/printer/printer.go
+++ b/printer/printer.go
@@ -2,9 +2,10 @@ package printer

 import (
 	"fmt"
-	"github.com/xgadget-lab/nexttrace/trace"
 	"strings"

+	"github.com/xgadget-lab/nexttrace/trace"
+
 	"github.com/xgadget-lab/nexttrace/ipgeo"
 )

@@ -14,12 +15,12 @@ func TraceroutePrinter(res *trace.Result) {
 	for i, hop := range res.Hops {
 		fmt.Print(i + 1)
 		for _, h := range hop {
-			hopPrinter(h)
+			HopPrinter(h)
 		}
 	}
 }

-func hopPrinter(h trace.Hop) {
+func HopPrinter(h trace.Hop) {
 	if h.Address == nil {
 		fmt.Println("\t*")
 	} else {
--- a/printer/printer_test.go
+++ b/printer/printer_test.go
@@ -0,0 +1,104 @@
+package printer
+
+import (
+	"errors"
+	"github.com/xgadget-lab/nexttrace/ipgeo"
+	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/xgadget-lab/nexttrace/util"
+	"net"
+	"testing"
+	"time"
+)
+
+func TestPrintTraceRouteNav(t *testing.T) {
+	PrintTraceRouteNav(util.DomainLookUp("1.1.1.1"), "1.1.1.1", "dataOrigin")
+}
+
+var testGeo = &ipgeo.IPGeoData{
+	Asnumber: "TestAsnumber",
+	Country:  "TestCountry",
+	Prov:     "TestProv",
+	City:     "TestCity",
+	District: "TestDistrict",
+	Owner:    "TestOwner",
+	Isp:      "TestIsp",
+}
+
+var testResult = &trace.Result{
+	Hops: [][]trace.Hop{
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo:      testGeo,
+			},
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo:      testGeo,
+			},
+		},
+		{
+			{
+				Success:  false,
+				Address:  nil,
+				Hostname: "",
+				TTL:      0,
+				RTT:      0,
+				Error:    errors.New("test error"),
+				Geo:      nil,
+			},
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo:      nil,
+			},
+		},
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      0,
+				Error:    nil,
+				Geo:      &ipgeo.IPGeoData{},
+			},
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
+				Hostname: "",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo:      testGeo,
+			},
+		},
+	},
+}
+
+func TestTraceroutePrinter(t *testing.T) {
+	TraceroutePrinter(testResult)
+}
+
+func TestTracerouteTablePrinter(t *testing.T) {
+	TracerouteTablePrinter(testResult)
+}
+
+func TestRealtimePrinter(t *testing.T) {
+	RealtimePrinter(testResult, 0)
+	RealtimePrinter(testResult, 1)
+	RealtimePrinter(testResult, 2)
+}
--- a/printer/realtime_printer.go
+++ b/printer/realtime_printer.go
@@ -0,0 +1,15 @@
+package printer
+
+import (
+	"fmt"
+
+	"github.com/xgadget-lab/nexttrace/trace"
+)
+
+func RealtimePrinter(res *trace.Result, ttl int) {
+	fmt.Print(ttl)
+	for i := range res.Hops[ttl] {
+		HopPrinter(res.Hops[ttl][i])
+	}
+
+}
--- a/printer/tableprinter.go
+++ b/printer/tableprinter.go
@@ -2,9 +2,11 @@ package printer

 import (
 	"fmt"
-	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/xgadget-lab/nexttrace/ipgeo"
 	"strings"

+	"github.com/xgadget-lab/nexttrace/trace"
+
 	"github.com/fatih/color"
 	"github.com/rodaine/table"
 )
@@ -30,7 +32,16 @@ func TracerouteTablePrinter(res *trace.Result) {
 			if k > 0 {
 				data.Hop = ""
 			}
-			tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, data.Country, data.Prov, data.City, data.Owner)
+			if data.Country == "" && data.Prov == "" && data.City == "" {
+				tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, "", data.Owner)
+			} else {
+				if data.City != "" {
+					tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, data.Country+", "+data.Prov+", "+data.City, data.Owner)
+				} else {
+					tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, data.Country, data.Owner)
+				}
+
+			}
 		}
 	}
 	// 打印表格
@@ -42,7 +53,7 @@ func New() table.Table {
 	headerFmt := color.New(color.FgGreen, color.Underline).SprintfFunc()
 	columnFmt := color.New(color.FgYellow).SprintfFunc()

-	tbl := table.New("Hop", "IP", "Lantency", "ASN", "Country", "Province", "City", "Owner")
+	tbl := table.New("Hop", "IP", "Lantency", "ASN", "Location", "Owner")
 	tbl.WithHeaderFormatter(headerFmt).WithFirstColumnFormatter(columnFmt)
 	return tbl
 }
@@ -79,6 +90,10 @@ func tableDataGenerator(h trace.Hop) *rowData {
 			IP = fmt.Sprint(h.Hostname, " (", IP, ") ")
 		}

+		if h.Geo == nil {
+			h.Geo = &ipgeo.IPGeoData{}
+		}
+
 		r := &rowData{
 			Hop:      fmt.Sprint(h.TTL),
 			IP:       IP,
--- a/quicklytest.sh
+++ b/quicklytest.sh
@@ -0,0 +1,245 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+Green_font="\033[32m" && Red_font="\033[31m" && Font_suffix="\033[0m"
+Info="${Green_font}[Info]${Font_suffix}"
+Error="${Red_font}[Error]${Font_suffix}"
+echo -e "${Green_font}
+#======================================
+# Project: NextTrace https://github.com/xgadget-lab/nexttrace
+# Copyright Notice:
+# This script is ported from @KANIKIG https://github.com/KANIKIG/
+# The developer team made some modifications to adapt to NextTrace under the GPL-3.0 LICENSE
+# NextTrace:
+#   XGadget-lab Leo (leo.moe) & Vincent (vincent.moe) & zhshch (xzhsh.ch)
+#   IP Geo Data Provider: LeoMoeAPI
+#======================================
+${Font_suffix}"
+
+check_root() {
+    [[ "$(id -u)" != "0" ]] && echo -e "${Error} must be root user !" && exit 1
+}
+checkNexttrace() {
+    echo -e "${Info} 正在检查Nexttrace..."
+    if curl -sL -O "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh" || curl -sL -O "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh"; then
+    bash nt_install.sh --auto > /dev/null
+    fi
+} 
+ask_if()
+{
+    local choice=""
+    while [ "$choice" != "y" ] && [ "$choice" != "n" ]
+    do
+        echo -e "${Info} $1"
+        read choice
+    done
+    [ $choice == y ] && return 0
+    return 1
+}
+#检查脚本更新
+check_script_update()
+{
+    [ "$(md5sum "${BASH_SOURCE[0]}" | awk '{print $1}')" == "$(md5sum <(curl -sL "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh") | awk '{print $1}')" ] && return 1 || return 0
+}
+#更新脚本
+update_script()
+{
+    if curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh" || curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh"; then
+        echo -e "${Info} 脚本更新完成，正在重启脚本..."
+        exec bash ${BASH_SOURCE[0]}
+    else
+        echo -e "${Info} 更新脚本失败！"
+        exit 1
+    fi
+}
+ask_update_script()
+{
+    if check_script_update; then
+        echo -e "${Info} 脚本可升级"
+        ask_if "是否升级脚本？(y/n)" && update_script
+    else
+        echo -e "${Info} 脚本已经是最新版本"
+    fi
+}
+check_mode() {
+    echo -e "${Info} Nexttrace目前支持以下三种协议发起Traceroute请求:\n1.ICMP\n2.TCP(速度最快,但部分节点不支持)\n3.UDP\n(IPv6暂只支持ICMP模式)" && read -p "输入数字以选择:" node
+
+    while [[ ! "${node}" =~ ^[1-3]$ ]]; do
+        echo -e "${Error} 无效输入"
+        echo -e "${Info} 请重新选择" && read -p "输入数字以选择:" node
+    done
+
+    [[ "${node}" == "1" ]] && TRACECMD="nexttrace"
+    [[ "${node}" == "2" ]] && TRACECMD="nexttrace -T"
+    [[ "${node}" == "3" ]] && TRACECMD="nexttrace -U"
+
+
+    echo -e "${Info} 结果是否制表?(制表模式为非实时显示)" 
+    if ask_if "输入y/n以选择模式:" ; then
+                TRACECMD=${TRACECMD}" -rdns -table"
+                ##Route-Path功能还未完善,临时替代:
+                [[ "${node}" == "2" ]] && TRACECMD=${TRACECMD}" -report"
+                ##
+    else        
+                TRACECMD=${TRACECMD}" -rdns -realtime"
+                ##Route-Path功能还未完善,临时替代:
+                [[ "${node}" == "1" ]] && TRACECMD=${TRACECMD}" -report"
+                ##
+    fi
+    
+    #echo -e "${Info} 是否输出Route-Path?" 
+    #ask_if "输入y/n以选择模式:" && TRACECMD=${TRACECMD}" -report"
+    
+    
+    
+}
+
+test_single() {
+    echo -e "${Info} 请输入你要测试的目标 ip :"
+    read -p "输入 ip 地址:" ip
+
+    while [[ -z "${ip}" ]]; do
+        echo -e "${Error} 无效输入"
+        echo -e "${Info} 请重新输入" && read -p "输入 ip 地址:" ip
+    done
+
+    ${TRACECMD} ${ip} | grep -v -E 'NextTrace|XGadget-lab|Data\ Provider'
+
+    repeat_test_single
+}
+repeat_test_single() {
+    echo -e "${Info} 是否继续测试其他目标 ip ?" 
+    if ask_if "输入y/n以选择:" ; then
+                test_single
+    else
+                echo -e "${Info} 退出脚本 ..." && exit 0
+    fi
+}
+
+test_alternative() {
+    select_alternative
+    set_alternative
+    result_alternative
+}
+select_alternative() {
+    echo -e "${Info} 选择需要测速的目标网络: \n1.中国电信\n2.中国联通\n3.中国移动\n4.教育网"
+    read -p "输入数字以选择:" ISP
+
+    while [[ ! "${ISP}" =~ ^[1-4]$ ]]; do
+        echo -e "${Error} 无效输入"
+        echo -e "${Info} 请重新选择" && read -p "输入数字以选择:" ISP
+    done
+}
+set_alternative() {
+    [[ "${ISP}" == "1" ]] && node_1
+    [[ "${ISP}" == "2" ]] && node_2
+    [[ "${ISP}" == "3" ]] && node_3
+    [[ "${ISP}" == "4" ]] && node_4
+}
+node_1() {
+    echo -e "1.上海电信(天翼云)\n2.厦门电信CN2\n3.北京电信\n4.江苏电信\n5.广东深圳电信\n6.广州电信(天翼云)\n7.浙江电信" && read -p "输入数字以选择:" node
+
+    while [[ ! "${node}" =~ ^[1-7]$ ]]; do
+        echo -e "${Error} 无效输入"
+        echo -e "${Info} 请重新选择" && read -p "输入数字以选择:" node
+    done
+
+    [[ "${node}" == "1" ]] && ISP_name="上海电信" && ip=101.89.132.9
+    [[ "${node}" == "2" ]] && ISP_name="厦门电信CN2" && ip=117.28.254.129
+    [[ "${node}" == "3" ]] && ISP_name="北京电信" && ip=120.92.180.135
+    [[ "${node}" == "4" ]] && ISP_name="江苏电信" && ip=221.229.173.233
+    [[ "${node}" == "5" ]] && ISP_name="广东深圳电信" && ip=116.6.211.41
+    [[ "${node}" == "6" ]] && ISP_name="广州电信(天翼云)" && ip=14.215.116.1
+    [[ "${node}" == "7" ]] && ISP_name="浙江电信" && ip=115.236.169.86
+}
+node_2() {
+    echo -e "1.上海联通\n2.重庆联通\n3.北京联通\n4.安徽合肥联通\n5.江苏南京联通\n6.浙江杭州联通\n7.广东联通" && read -p "输入数字以选择:" node
+
+    while [[ ! "${node}" =~ ^[1-7]$ ]]; do
+        echo -e "${Error} 无效输入"
+        echo -e "${Info} 请重新选择" && read -p "输入数字以选择:" node
+    done
+
+    [[ "${node}" == "1" ]] && ISP_name="上海联通" && ip=220.196.252.174
+    [[ "${node}" == "2" ]] && ISP_name="重庆联通" && ip=113.207.32.65
+    [[ "${node}" == "3" ]] && ISP_name="北京联通" && ip=202.106.54.150
+    [[ "${node}" == "4" ]] && ISP_name="安徽合肥联通" && ip=112.122.10.26
+    [[ "${node}" == "5" ]] && ISP_name="江苏联通" && ip=112.85.231.129
+    [[ "${node}" == "6" ]] && ISP_name="浙江联通" && ip=60.12.214.156
+    [[ "${node}" == "7" ]] && ISP_name="广东联通" && ip=58.252.2.194
+}
+node_3() {
+    echo -e "1.上海移动\n2.四川成都移动\n3.北京移动\n4.浙江杭州移动\n5.广东移动\n6.江苏移动\n7.浙江移动" && read -p "输入数字以选择:" node
+
+    while [[ ! "${node}" =~ ^[1-7]$ ]]; do
+        echo -e "${Error} 无效输入"
+        echo -e "${Info} 请重新选择" && read -p "输入数字以选择:" node
+    done
+
+    [[ "${node}" == "1" ]] && ISP_name="上海移动" && ip=117.184.42.114
+    [[ "${node}" == "2" ]] && ISP_name="四川成都移动" && ip=183.221.247.9
+    [[ "${node}" == "3" ]] && ISP_name="北京移动" && ip=111.13.217.125
+    [[ "${node}" == "4" ]] && ISP_name="浙江移动" && ip=183.246.69.139
+    [[ "${node}" == "5" ]] && ISP_name="广东移动" && ip=221.179.44.57
+    [[ "${node}" == "6" ]] && ISP_name="江苏移动" && ip=120.195.6.129
+    [[ "${node}" == "7" ]] && ISP_name="浙江移动" && ip=183.246.69.139
+}
+node_4() {
+    ISP_name="北京教育网" && ip=211.68.69.240
+}
+result_alternative() {
+    echo -e "${Info} 测试路由 到 ${ISP_name} 中 ..."
+    ${TRACECMD} ${ip} | grep -v -E 'NextTrace|XGadget-lab|Data\ Provider'
+    echo -e "${Info} 测试路由 到 ${ISP_name} 完成 ！"
+
+    repeat_test_alternative
+}
+repeat_test_alternative() {
+    echo -e "${Info} 是否继续测试其他节点?" 
+    if ask_if "输入y/n以选择:" ; then
+                test_alternative
+    else
+                echo -e "${Info} 退出脚本 ..." && exit 0
+    fi
+}
+
+test_all() {
+    result_all '116.6.211.41' '广东东莞CN2'
+
+    result_all '101.95.110.149' '上海电信'
+
+    result_all '112.85.231.129' '江苏徐州联通'
+
+    result_all '120.199.239.1' '浙江杭州移动'
+
+    result_all '211.68.69.240' '北京教育网'
+
+    echo -e "${Info} 四网路由快速测试 已完成 ！"
+}
+result_all() {
+    ISP_name=$2
+    echo -e "${Info} 测试路由 到 ${ISP_name} 中 ..."
+    ${TRACECMD} $1 | grep -v -E 'NextTrace|XGadget-lab|Data\ Provider'
+    echo -e "${Info} 测试路由 到 ${ISP_name} 完成 ！"
+}
+
+check_root
+ask_update_script
+checkNexttrace
+check_mode
+echo -e "${Info} 选择你要使用的功能: "
+echo -e "1.选择一个节点进行测试\n2.四网路由快速测试\n3.手动输入 ip 进行测试"
+read -p "输入数字以选择:" function
+
+while [[ ! "${function}" =~ ^[1-3]$ ]]; do
+    echo -e "${Error} 缺少或无效输入"
+    echo -e "${Info} 请重新选择" && read -p "输入数字以选择:" function
+done
+
+if [[ "${function}" == "1" ]]; then
+    test_alternative
+elif [[ "${function}" == "2" ]]; then
+    test_all
+else
+    test_single
+fi
--- a/reporter/reporter.go
+++ b/reporter/reporter.go
@@ -1,10 +1,10 @@
 package reporter

 import (
-	"errors"
 	"fmt"
 	"net"
 	"strings"
+	"sync"

 	"github.com/xgadget-lab/nexttrace/ipgeo"
 	"github.com/xgadget-lab/nexttrace/trace"
@@ -24,9 +24,12 @@ func New(rs *trace.Result, ip string) Reporter {
 }

 type reporter struct {
-	targetIP    string
-	routeReport map[uint16][]routeReportNode
-	routeResult *trace.Result
+	targetTTL       uint16
+	targetIP        string
+	routeReport     map[uint16][]routeReportNode
+	routeReportLock sync.Mutex
+	routeResult     *trace.Result
+	wg              sync.WaitGroup
 }

 type routeReportNode struct {
@@ -40,9 +43,15 @@ func experimentTag() {
 	fmt.Println("Route-Path 功能实验室")
 }

-func (r *reporter) generateRouteReportNode(ip string, ipGeoData ipgeo.IPGeoData) (routeReportNode, error) {
+func (r *reporter) generateRouteReportNode(ip string, ipGeoData ipgeo.IPGeoData, ttl uint16) {
+
+	var success bool = true
+
+	defer r.wg.Done()
+
 	rpn := routeReportNode{}
 	ptr, err := net.LookupAddr(ip)
+
 	if err == nil {
 		if strings.Contains(strings.ToLower(ptr[0]), "ix") {
 			rpn.ix = true
@@ -50,59 +59,90 @@ func (r *reporter) generateRouteReportNode(ip string, ipGeoData ipgeo.IPGeoData)
 			rpn.ix = false
 		}
 	}
-
+	// TODO: 这种写法不好，后面再重构一下
+	// 判断反向解析的域名中又或者是IP地理位置数据库中，是否出现了 IX
 	if strings.Contains(strings.ToLower(ipGeoData.Isp), "exchange") || strings.Contains(strings.ToLower(ipGeoData.Isp), "ix") || strings.Contains(strings.ToLower(ipGeoData.Owner), "exchange") || strings.Contains(strings.ToLower(ipGeoData.Owner), "ix") {
 		rpn.ix = true
 	}
+
+	// TODO: 正则判断POP并且提取带宽大小等信息
+
+	// CN2 需要特殊处理，因为他们很多没有ASN
+	// 但是目前这种写法是不规范的，属于凭空标记4809的IP
+	// TODO: 用更好的方式显示 CN2 骨干网的路由 Path
 	if strings.HasPrefix(ip, "59.43") {
 		rpn.asn = "4809"
 	} else {
 		rpn.asn = ipGeoData.Asnumber
 	}
+
 	// 无论最后一跳是否为存在地理位置信息（AnyCast），都应该给予显示
-	if ipGeoData.Country == "" || ipGeoData.City == "" && ip != r.targetIP {
-		return rpn, errors.New("GeoData Search Failed")
+	if (ipGeoData.Country == "" || ipGeoData.Country == "LAN Address" || ipGeoData.Country == "-") && ip != r.targetIP {
+		success = false
 	} else {
 		if ipGeoData.City == "" {
-			rpn.geo = []string{ipGeoData.Country, ipGeoData.Country}
+			rpn.geo = []string{ipGeoData.Country, ipGeoData.Prov}
 		} else {
 			rpn.geo = []string{ipGeoData.Country, ipGeoData.City}
 		}
 	}
+	if ipGeoData.Asnumber == "" {
+		rpn.asn = "*"
+	}
+
 	if ipGeoData.Isp == "" {
 		rpn.isp = ipGeoData.Owner
 	} else {
 		rpn.isp = ipGeoData.Isp
 	}
-	return rpn, nil
+
+	// 有效记录
+	if success {
+		// 锁住资源，防止同时写panic
+		r.routeReportLock.Lock()
+		// 添加到MAP中
+		r.routeReport[ttl] = append(r.routeReport[ttl], rpn)
+		// 写入完成，解锁释放资源给其他协程
+		r.routeReportLock.Unlock()
+	}
 }

 func (r *reporter) InitialBaseData() Reporter {
-	var nodeIndex uint16 = 1
 	reportNodes := map[uint16][]routeReportNode{}
-	for i := uint16(0); int(i) < len(r.routeResult.Hops); i++ {
+
+	r.routeReport = reportNodes
+	r.targetTTL = uint16(len(r.routeResult.Hops))
+
+	for i := uint16(0); i < r.targetTTL; i++ {
 		traceHop := r.routeResult.Hops[i][0]
 		if traceHop.Success {
 			currentIP := traceHop.Address.String()
-			rpn, err := r.generateRouteReportNode(currentIP, *traceHop.Geo)
-			if err == nil {
-				reportNodes[nodeIndex] = append(reportNodes[nodeIndex], rpn)
-				nodeIndex += 1
-			}
+			r.wg.Add(1)
+			go r.generateRouteReportNode(currentIP, *traceHop.Geo, i)
 		}
 	}
-	r.routeReport = reportNodes
+
+	// 等待所有的子协程运行完毕
+	r.wg.Wait()
 	return r
 }

 func (r *reporter) Print() {
+	var beforeActiveTTL uint16 = 0
 	r.InitialBaseData()
-	for i := uint16(1); int(i) < len(r.routeReport)+1; i++ {
+	for i := uint16(1); i < r.targetTTL; i++ {
+		// 计算该TTL内的数据长度，如果为0，则代表没有有效数据
+		if len(r.routeReport[i]) == 0 {
+			// 跳过改跃点的数据整理
+			continue
+		}
 		nodeReport := r.routeReport[i][0]
+
 		if i == 1 {
 			fmt.Printf("AS%s %s「%s『%s", nodeReport.asn, nodeReport.isp, nodeReport.geo[0], nodeReport.geo[1])
 		} else {
-			nodeReportBefore := r.routeReport[i-1][0]
+			nodeReportBefore := r.routeReport[beforeActiveTTL][0]
+			// ASN 相同，同个 ISP 内部的数据传递
 			if nodeReportBefore.asn == nodeReport.asn {
 				// Same ASN but Coutry or City Changed
 				if nodeReportBefore.geo[0] != nodeReport.geo[0] {
@@ -113,8 +153,11 @@ func (r *reporter) Print() {
 					}
 				}
 			} else {
+				// ASN 不同，跨 ISP 的数据传递，这里可能会出现 POP、IP Transit、Peer、Exchange
 				fmt.Printf("』」")
 				if int(i) != len(r.routeReport)+1 {
+					// 部分 Shell 客户端可能无法很好的展示这个特殊字符
+					// TODO: 寻找其他替代字符
 					fmt.Printf("\n ╭╯\n ╰")
 				}
 				if nodeReport.ix {
@@ -124,6 +167,8 @@ func (r *reporter) Print() {
 				}
 			}
 		}
+		// 标记为最新的一个有效跃点
+		beforeActiveTTL = i
 	}
 	fmt.Println("』」")
 }
--- a/reporter/reporter_test.go
+++ b/reporter/reporter_test.go
@@ -1,31 +1,115 @@
 package reporter

 import (
+	"net"
 	"testing"
 	"time"

 	"github.com/xgadget-lab/nexttrace/ipgeo"
 	"github.com/xgadget-lab/nexttrace/trace"
-	"github.com/xgadget-lab/nexttrace/util"
 )

+var testResult = &trace.Result{
+	Hops: [][]trace.Hop{
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo: &ipgeo.IPGeoData{
+					Asnumber: "4808",
+					Country:  "中国",
+					Prov:     "北京市",
+					City:     "北京市",
+					District: "北京市",
+					Owner:    "",
+					Isp:      "中国联通",
+				},
+			},
+		},
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("114.249.16.1")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo: &ipgeo.IPGeoData{
+					Asnumber: "4808",
+					Country:  "中国",
+					Prov:     "北京市",
+					City:     "北京市",
+					District: "北京市",
+					Owner:    "",
+					Isp:      "中国联通",
+				},
+			},
+		},
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("219.158.5.150")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo: &ipgeo.IPGeoData{
+					Asnumber: "4837",
+					Country:  "中国",
+					Prov:     "",
+					City:     "",
+					District: "",
+					Owner:    "",
+					Isp:      "中国联通",
+				},
+			},
+		},
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("62.115.125.160")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo: &ipgeo.IPGeoData{
+					Asnumber: "1299",
+					Country:  "Sweden",
+					Prov:     "Stockholm County",
+					City:     "Stockholm",
+					District: "",
+					Owner:    "",
+					Isp:      "Telia Company AB",
+				},
+			},
+		},
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("213.226.68.73")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo: &ipgeo.IPGeoData{
+					Asnumber: "56630",
+					Country:  "Germany",
+					Prov:     "Hesse, Frankfurt",
+					City:     "",
+					District: "",
+					Owner:    "",
+					Isp:      "Melbikomas UAB",
+				},
+			},
+		},
+	},
+}
+
 func TestPrint(t *testing.T) {
-	ip := util.DomainLookUp("213.226.68.73")
-	var m trace.Method = "tcp"
-	var conf = trace.Config{
-		DestIP:           ip,
-		DestPort:         80,
-		MaxHops:          30,
-		NumMeasurements:  1,
-		ParallelRequests: 1,
-		RDns:             true,
-		IPGeoSource:      ipgeo.GetSource("LeoMoeAPI"),
-		Timeout:          2 * time.Second,
-
-		//Quic:    false,
-	}
-
-	res, _ := trace.Traceroute(m, conf)
-	r := New(res, ip.String())
+	r := New(testResult, "213.226.68.73")
 	r.Print()
 }
--- a/signal/signal.go
+++ b/signal/signal.go
@@ -1,19 +0,0 @@
-package signal
-
-type Signal struct {
-	sigChan chan struct{}
-}
-
-func New() *Signal {
-	return &Signal{sigChan: make(chan struct{}, 1)}
-}
-
-func (s *Signal) Signal() {
-	if len(s.sigChan) == 0 {
-		s.sigChan <- struct{}{}
-	}
-}
-
-func (s *Signal) Chan() chan struct{} {
-	return s.sigChan
-}
--- a/taskgroup/taskgroup.go
+++ b/taskgroup/taskgroup.go
@@ -1,45 +0,0 @@
-package taskgroup
-
-import (
-	"sync"
-)
-
-type TaskGroup struct {
-	count int
-	mu    sync.Mutex
-	done  []chan struct{}
-}
-
-func New() *TaskGroup {
-	return &TaskGroup{
-		count: 0,
-		mu:    sync.Mutex{},
-		done:  []chan struct{}{},
-	}
-}
-
-func (t *TaskGroup) Add() {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	t.count++
-}
-
-func (t *TaskGroup) Done() {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	if t.count-1 == 0 {
-		for _, doneChannel := range t.done {
-			doneChannel <- struct{}{}
-		}
-		t.done = []chan struct{}{}
-	}
-	t.count--
-}
-
-func (t *TaskGroup) Wait() {
-	doneChannel := make(chan struct{})
-	t.mu.Lock()
-	t.done = append(t.done, doneChannel)
-	t.mu.Unlock()
-	<-doneChannel
-}
--- a/trace/icmp_ipv4.go
+++ b/trace/icmp_ipv4.go
@@ -0,0 +1,175 @@
+package trace
+
+import (
+	"log"
+	"net"
+	"os"
+	"sync"
+	"time"
+
+	"golang.org/x/net/context"
+	"golang.org/x/net/icmp"
+	"golang.org/x/net/ipv4"
+)
+
+type ICMPTracer struct {
+	Config
+	wg         sync.WaitGroup
+	res        Result
+	ctx        context.Context
+	resCh      chan Hop
+	icmpListen net.PacketConn
+	final      int
+	finalLock  sync.Mutex
+}
+
+func (t *ICMPTracer) Execute() (*Result, error) {
+	if len(t.res.Hops) > 0 {
+		return &t.res, ErrTracerouteExecuted
+	}
+
+	var err error
+
+	t.icmpListen, err = net.ListenPacket("ip4:1", "0.0.0.0")
+	if err != nil {
+		return &t.res, err
+	}
+	defer t.icmpListen.Close()
+
+	var cancel context.CancelFunc
+	t.ctx, cancel = context.WithCancel(context.Background())
+	defer cancel()
+	t.resCh = make(chan Hop)
+	t.final = -1
+
+	go t.listenICMP()
+
+	for ttl := 1; ttl <= t.MaxHops; ttl++ {
+		if t.final != -1 && ttl > t.final {
+			break
+		}
+		for i := 0; i < t.NumMeasurements; i++ {
+			t.wg.Add(1)
+			go t.send(ttl)
+		}
+		// 一组TTL全部退出（收到应答或者超时终止）以后，再进行下一个TTL的包发送
+		t.wg.Wait()
+		if t.RealtimePrinter != nil {
+			t.RealtimePrinter(&t.res, ttl-1)
+		}
+	}
+	t.res.reduce(t.final)
+
+	return &t.res, nil
+}
+
+func (t *ICMPTracer) listenICMP() {
+	lc := NewPacketListener(t.icmpListen, t.ctx)
+	go lc.Start()
+	for {
+		select {
+		case <-t.ctx.Done():
+			return
+		case msg := <-lc.Messages:
+			if msg.N == nil {
+				continue
+			}
+			rm, err := icmp.ParseMessage(1, msg.Msg[:*msg.N])
+			if err != nil {
+				log.Println(err)
+				continue
+			}
+			switch rm.Type {
+			case ipv4.ICMPTypeTimeExceeded:
+				t.handleICMPMessage(msg, 0, rm.Body.(*icmp.TimeExceeded).Data)
+			case ipv4.ICMPTypeEchoReply:
+				t.handleICMPMessage(msg, 1, rm.Body.(*icmp.Echo).Data)
+			default:
+				// log.Println("received icmp message of unknown type", rm.Type)
+			}
+		}
+	}
+
+}
+
+func (t *ICMPTracer) handleICMPMessage(msg ReceivedMessage, icmpType int8, data []byte) {
+	t.resCh <- Hop{
+		Success: true,
+		Address: msg.Peer,
+	}
+}
+
+func (t *ICMPTracer) send(ttl int) error {
+	defer t.wg.Done()
+	if t.final != -1 && ttl > t.final {
+		return nil
+	}
+
+	icmpHeader := icmp.Message{
+		Type: ipv4.ICMPTypeEcho, Code: 0,
+		Body: &icmp.Echo{
+			ID:   os.Getpid() & 0xffff,
+			Data: []byte("HELLO-R-U-THERE"),
+		},
+	}
+
+	ipv4.NewPacketConn(t.icmpListen).SetTTL(ttl)
+
+	wb, err := icmpHeader.Marshal(nil)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	start := time.Now()
+	if _, err := t.icmpListen.WriteTo(wb, &net.IPAddr{IP: t.DestIP}); err != nil {
+		log.Fatal(err)
+	}
+	if err := t.icmpListen.SetReadDeadline(time.Now().Add(3 * time.Second)); err != nil {
+		log.Fatal(err)
+	}
+
+	select {
+	case <-t.ctx.Done():
+		return nil
+	case h := <-t.resCh:
+		rtt := time.Since(start)
+		if t.final != -1 && ttl > t.final {
+			return nil
+		}
+		if addr, ok := h.Address.(*net.IPAddr); ok && addr.IP.Equal(t.DestIP) {
+			t.finalLock.Lock()
+			if t.final == -1 || ttl < t.final {
+				t.final = ttl
+			}
+			t.finalLock.Unlock()
+		} else if addr, ok := h.Address.(*net.TCPAddr); ok && addr.IP.Equal(t.DestIP) {
+			t.finalLock.Lock()
+			if t.final == -1 || ttl < t.final {
+				t.final = ttl
+			}
+			t.finalLock.Unlock()
+		}
+
+		h.TTL = ttl
+		h.RTT = rtt
+
+		h.fetchIPData(t.Config)
+
+		t.res.add(h)
+
+	case <-time.After(t.Timeout):
+		if t.final != -1 && ttl > t.final {
+			return nil
+		}
+
+		t.res.add(Hop{
+			Success: false,
+			Address: nil,
+			TTL:     ttl,
+			RTT:     0,
+			Error:   ErrHopLimitTimeout,
+		})
+	}
+
+	return nil
+}
--- a/trace/icmp_ipv6.go
+++ b/trace/icmp_ipv6.go
@@ -0,0 +1,179 @@
+package trace
+
+import (
+	"log"
+	"net"
+	"os"
+	"sync"
+	"time"
+
+	"golang.org/x/net/context"
+	"golang.org/x/net/icmp"
+	"golang.org/x/net/ipv6"
+)
+
+type ICMPTracerv6 struct {
+	Config
+	wg         sync.WaitGroup
+	res        Result
+	ctx        context.Context
+	resCh      chan Hop
+	icmpListen net.PacketConn
+	final      int
+	finalLock  sync.Mutex
+}
+
+func (t *ICMPTracerv6) Execute() (*Result, error) {
+	if len(t.res.Hops) > 0 {
+		return &t.res, ErrTracerouteExecuted
+	}
+
+	var err error
+
+	t.icmpListen, err = net.ListenPacket("ip6:58", "::")
+	if err != nil {
+		return &t.res, err
+	}
+	defer t.icmpListen.Close()
+
+	var cancel context.CancelFunc
+	t.ctx, cancel = context.WithCancel(context.Background())
+	defer cancel()
+	t.resCh = make(chan Hop)
+	t.final = -1
+
+	go t.listenICMP()
+
+	for ttl := 1; ttl <= t.MaxHops; ttl++ {
+		if t.final != -1 && ttl > t.final {
+			break
+		}
+		for i := 0; i < t.NumMeasurements; i++ {
+			t.wg.Add(1)
+			go t.send(ttl)
+		}
+		// 一组TTL全部退出（收到应答或者超时终止）以后，再进行下一个TTL的包发送
+		t.wg.Wait()
+		if t.RealtimePrinter != nil {
+			t.RealtimePrinter(&t.res, ttl-1)
+		}
+	}
+	t.res.reduce(t.final)
+
+	return &t.res, nil
+}
+
+func (t *ICMPTracerv6) listenICMP() {
+	lc := NewPacketListener(t.icmpListen, t.ctx)
+	go lc.Start()
+	for {
+		select {
+		case <-t.ctx.Done():
+			return
+		case msg := <-lc.Messages:
+			if msg.N == nil {
+				continue
+			}
+			rm, err := icmp.ParseMessage(58, msg.Msg[:*msg.N])
+			if err != nil {
+				log.Println(err)
+				continue
+			}
+			// log.Println(msg.Peer)
+			switch rm.Type {
+			case ipv6.ICMPTypeTimeExceeded:
+				t.handleICMPMessage(msg, 0, rm.Body.(*icmp.TimeExceeded).Data)
+			case ipv6.ICMPTypeEchoReply:
+				t.handleICMPMessage(msg, 1, rm.Body.(*icmp.Echo).Data)
+			default:
+				// log.Println("received icmp message of unknown type", rm.Type)
+			}
+		}
+	}
+
+}
+
+func (t *ICMPTracerv6) handleICMPMessage(msg ReceivedMessage, icmpType int8, data []byte) {
+	t.resCh <- Hop{
+		Success: true,
+		Address: msg.Peer,
+	}
+}
+
+func (t *ICMPTracerv6) send(ttl int) error {
+	defer t.wg.Done()
+	if t.final != -1 && ttl > t.final {
+		return nil
+	}
+
+	icmpHeader := icmp.Message{
+		Type: ipv6.ICMPTypeEchoRequest, Code: 0,
+		Body: &icmp.Echo{
+			ID:   os.Getpid() & 0xffff,
+			Data: []byte("HELLO-R-U-THERE"),
+		},
+	}
+
+	p := ipv6.NewPacketConn(t.icmpListen)
+
+	icmpHeader.Body.(*icmp.Echo).Seq = ttl
+	p.SetHopLimit(ttl)
+
+	wb, err := icmpHeader.Marshal(nil)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	start := time.Now()
+	if _, err := t.icmpListen.WriteTo(wb, &net.IPAddr{IP: t.DestIP}); err != nil {
+		log.Fatal(err)
+	}
+	if err := t.icmpListen.SetReadDeadline(time.Now().Add(3 * time.Second)); err != nil {
+		log.Fatal(err)
+	}
+
+	select {
+	case <-t.ctx.Done():
+		return nil
+	case h := <-t.resCh:
+		rtt := time.Since(start)
+		if t.final != -1 && ttl > t.final {
+			return nil
+		}
+		if addr, ok := h.Address.(*net.IPAddr); ok && addr.IP.Equal(t.DestIP) {
+			t.finalLock.Lock()
+			if t.final == -1 || ttl < t.final {
+				t.final = ttl
+			}
+			t.finalLock.Unlock()
+		} else if addr, ok := h.Address.(*net.TCPAddr); ok && addr.IP.Equal(t.DestIP) {
+			t.finalLock.Lock()
+			if t.final == -1 || ttl < t.final {
+				t.final = ttl
+			}
+			t.finalLock.Unlock()
+		}
+
+		h.TTL = ttl
+		h.RTT = rtt
+
+		h.fetchIPData(t.Config)
+
+		t.res.add(h)
+
+	case <-time.After(t.Timeout):
+		if t.final != -1 && ttl > t.final {
+			return nil
+		}
+
+		t.res.add(Hop{
+			Success: false,
+			Address: nil,
+			TTL:     ttl,
+			RTT:     0,
+			Error:   ErrHopLimitTimeout,
+		})
+	}
+
+	return nil
+}
--- a/trace/tcp_ipv4.go
+++ b/trace/tcp_ipv4.go
@@ -10,7 +10,6 @@ import (

 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/xgadget-lab/nexttrace/listener_channel"
 	"github.com/xgadget-lab/nexttrace/util"
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
@@ -110,10 +109,7 @@ func (t *TCPTracer) listenICMP() {
 // @title    listenTCP
 // @description   监听TCP的响应数据包
 func (t *TCPTracer) listenTCP() {
-	lc := listener_channel.New(t.tcp)
-
-	defer lc.Stop()
-
+	lc := NewPacketListener(t.tcp, t.ctx)
 	go lc.Start()

 	for {
@@ -163,6 +159,7 @@ func (t *TCPTracer) handleICMPMessage(msg ReceivedMessage, data []byte) {
 		Success: true,
 		Address: msg.Peer,
 	}
+
 }

 func (t *TCPTracer) send(ttl int) error {
@@ -219,7 +216,7 @@ func (t *TCPTracer) send(ttl int) error {
 	t.inflightRequest[int(sequenceNumber)] = hopCh
 	t.inflightRequestLock.Unlock()
 	/*
-		// 关了会有问题，偶见 panic: send on closed channel 报错
+		// 这里属于 2个Sender，N个Reciever的情况，在哪里关闭Channel都容易导致Panic
 		defer func() {
 			t.inflightRequestLock.Lock()
 			close(hopCh)
--- a/trace/tcp_ipv6.go
+++ b/trace/tcp_ipv6.go
@@ -0,0 +1,265 @@
+package trace
+
+import (
+	"log"
+	"math"
+	"math/rand"
+	"net"
+	"sync"
+	"time"
+
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
+	"github.com/xgadget-lab/nexttrace/util"
+	"golang.org/x/net/context"
+	"golang.org/x/net/icmp"
+	"golang.org/x/net/ipv6"
+	"golang.org/x/sync/semaphore"
+)
+
+type TCPTracerv6 struct {
+	Config
+	wg                  sync.WaitGroup
+	res                 Result
+	ctx                 context.Context
+	inflightRequest     map[int]chan Hop
+	inflightRequestLock sync.Mutex
+	SrcIP               net.IP
+	icmp                net.PacketConn
+	tcp                 net.PacketConn
+
+	final     int
+	finalLock sync.Mutex
+
+	sem *semaphore.Weighted
+}
+
+func (t *TCPTracerv6) Execute() (*Result, error) {
+	if len(t.res.Hops) > 0 {
+		return &t.res, ErrTracerouteExecuted
+	}
+
+	t.SrcIP, _ = util.LocalIPPort(t.DestIP)
+	log.Println(util.LocalIPPort(t.DestIP))
+	var err error
+	t.tcp, err = net.ListenPacket("ip6:tcp", t.SrcIP.String())
+	if err != nil {
+		return nil, err
+	}
+	t.icmp, err = icmp.ListenPacket("ip6:53", "::")
+	if err != nil {
+		return &t.res, err
+	}
+	defer t.icmp.Close()
+
+	var cancel context.CancelFunc
+	t.ctx, cancel = context.WithCancel(context.Background())
+	defer cancel()
+	t.inflightRequest = make(map[int]chan Hop)
+	t.final = -1
+
+	go t.listenICMP()
+	go t.listenTCP()
+
+	t.sem = semaphore.NewWeighted(int64(t.ParallelRequests))
+
+	for ttl := 1; ttl <= t.MaxHops; ttl++ {
+		for i := 0; i < t.NumMeasurements; i++ {
+			t.wg.Add(1)
+			go t.send(ttl)
+
+		}
+		time.Sleep(1 * time.Millisecond)
+	}
+	t.wg.Wait()
+	t.res.reduce(t.final)
+
+	return &t.res, nil
+}
+
+func (t *TCPTracerv6) listenICMP() {
+	lc := NewPacketListener(t.icmp, t.ctx)
+	go lc.Start()
+	for {
+		select {
+		case <-t.ctx.Done():
+			return
+		case msg := <-lc.Messages:
+			if msg.N == nil {
+				continue
+			}
+			rm, err := icmp.ParseMessage(53, msg.Msg[:*msg.N])
+			if err != nil {
+				log.Println(err)
+				continue
+			}
+			log.Println(msg.Peer)
+			switch rm.Type {
+			case ipv6.ICMPTypeTimeExceeded:
+				t.handleICMPMessage(msg, rm.Body.(*icmp.TimeExceeded).Data)
+			case ipv6.ICMPTypeDestinationUnreachable:
+				t.handleICMPMessage(msg, rm.Body.(*icmp.DstUnreach).Data)
+			default:
+				//log.Println("received icmp message of unknown type", rm.Type)
+			}
+		}
+	}
+
+}
+
+// @title    listenTCP
+// @description   监听TCP的响应数据包
+func (t *TCPTracerv6) listenTCP() {
+	lc := NewPacketListener(t.tcp, t.ctx)
+	go lc.Start()
+
+	for {
+		select {
+		case <-t.ctx.Done():
+			return
+		case msg := <-lc.Messages:
+			if msg.N == nil {
+				continue
+			}
+			if msg.Peer.String() != t.DestIP.String() {
+				continue
+			}
+
+			// 解包
+			packet := gopacket.NewPacket(msg.Msg[:*msg.N], layers.LayerTypeTCP, gopacket.Default)
+			// 从包中获取TCP layer信息
+			if tcpLayer := packet.Layer(layers.LayerTypeTCP); tcpLayer != nil {
+				tcp, _ := tcpLayer.(*layers.TCP)
+				// 取得目标主机的Sequence Number
+
+				if ch, ok := t.inflightRequest[int(tcp.Ack-1)]; ok {
+					// 最后一跳
+					ch <- Hop{
+						Success: true,
+						Address: msg.Peer,
+					}
+				}
+			}
+		}
+	}
+}
+
+func (t *TCPTracerv6) handleICMPMessage(msg ReceivedMessage, data []byte) {
+	header, err := util.GetICMPResponsePayload(data)
+	if err != nil {
+		return
+	}
+	sequenceNumber := util.GetTCPSeq(header)
+	t.inflightRequestLock.Lock()
+	defer t.inflightRequestLock.Unlock()
+	ch, ok := t.inflightRequest[int(sequenceNumber)]
+	if !ok {
+		return
+	}
+	ch <- Hop{
+		Success: true,
+		Address: msg.Peer,
+	}
+
+}
+
+func (t *TCPTracerv6) send(ttl int) error {
+	err := t.sem.Acquire(context.Background(), 1)
+	if err != nil {
+		return err
+	}
+	defer t.sem.Release(1)
+
+	defer t.wg.Done()
+	if t.final != -1 && ttl > t.final {
+		return nil
+	}
+	// 随机种子
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	_, srcPort := util.LocalIPPort(t.DestIP)
+	ipHeader := &layers.IPv6{
+		SrcIP:      t.SrcIP,
+		DstIP:      t.DestIP,
+		NextHeader: layers.IPProtocolTCP,
+		HopLimit:   uint8(ttl),
+	}
+	// 使用Uint16兼容32位系统，防止在rand的时候因使用int32而溢出
+	sequenceNumber := uint32(r.Intn(math.MaxUint16))
+	tcpHeader := &layers.TCP{
+		SrcPort: layers.TCPPort(srcPort),
+		DstPort: layers.TCPPort(t.DestPort),
+		Seq:     sequenceNumber,
+		SYN:     true,
+		Window:  14600,
+	}
+	_ = tcpHeader.SetNetworkLayerForChecksum(ipHeader)
+
+	buf := gopacket.NewSerializeBuffer()
+	opts := gopacket.SerializeOptions{
+		ComputeChecksums: true,
+		FixLengths:       true,
+	}
+	if err := gopacket.SerializeLayers(buf, opts, tcpHeader); err != nil {
+		return err
+	}
+
+	ipv6.NewPacketConn(t.tcp).SetHopLimit(ttl)
+	if err != nil {
+		return err
+	}
+
+	start := time.Now()
+	if _, err := t.tcp.WriteTo(buf.Bytes(), &net.IPAddr{IP: t.DestIP}); err != nil {
+		return err
+	}
+	t.inflightRequestLock.Lock()
+	hopCh := make(chan Hop)
+	t.inflightRequest[int(sequenceNumber)] = hopCh
+	t.inflightRequestLock.Unlock()
+
+	select {
+	case <-t.ctx.Done():
+		return nil
+	case h := <-hopCh:
+		rtt := time.Since(start)
+		if t.final != -1 && ttl > t.final {
+			return nil
+		}
+
+		if addr, ok := h.Address.(*net.IPAddr); ok && addr.IP.Equal(t.DestIP) {
+			t.finalLock.Lock()
+			if t.final == -1 || ttl < t.final {
+				t.final = ttl
+			}
+			t.finalLock.Unlock()
+		} else if addr, ok := h.Address.(*net.TCPAddr); ok && addr.IP.Equal(t.DestIP) {
+			t.finalLock.Lock()
+			if t.final == -1 || ttl < t.final {
+				t.final = ttl
+			}
+			t.finalLock.Unlock()
+		}
+
+		h.TTL = ttl
+		h.RTT = rtt
+
+		h.fetchIPData(t.Config)
+
+		t.res.add(h)
+
+	case <-time.After(t.Timeout):
+		if t.final != -1 && ttl > t.final {
+			return nil
+		}
+
+		t.res.add(Hop{
+			Success: false,
+			Address: nil,
+			TTL:     ttl,
+			RTT:     0,
+			Error:   ErrHopLimitTimeout,
+		})
+	}
+
+	return nil
+}
--- a/trace/temp_printer.go
+++ b/trace/temp_printer.go
@@ -0,0 +1,76 @@
+package trace
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/xgadget-lab/nexttrace/ipgeo"
+)
+
+func HopPrinter(h Hop) {
+	if h.Address == nil {
+		fmt.Println("\t*")
+	} else {
+		txt := "\t"
+
+		if h.Hostname == "" {
+			txt += fmt.Sprint(h.Address, " ", fmt.Sprintf("%.2f", h.RTT.Seconds()*1000), "ms")
+		} else {
+			txt += fmt.Sprint(h.Hostname, " (", h.Address, ") ", fmt.Sprintf("%.2f", h.RTT.Seconds()*1000), "ms")
+		}
+
+		if h.Geo != nil {
+			txt += " " + formatIpGeoData(h.Address.String(), h.Geo)
+		}
+
+		fmt.Println(txt)
+	}
+}
+
+func formatIpGeoData(ip string, data *ipgeo.IPGeoData) string {
+	var res = make([]string, 0, 10)
+
+	if data.Asnumber == "" {
+		res = append(res, "*")
+	} else {
+		res = append(res, "AS"+data.Asnumber)
+	}
+
+	// TODO: 判断阿里云和腾讯云内网，数据不足，有待进一步完善
+	// TODO: 移动IDC判断到Hop.fetchIPData函数，减少API调用
+	if strings.HasPrefix(ip, "9.") {
+		res = append(res, "局域网", "腾讯云")
+	} else if strings.HasPrefix(ip, "11.") {
+		res = append(res, "局域网", "阿里云")
+	} else if data.Country == "" {
+		res = append(res, "局域网")
+	} else {
+		// 有些IP的归属信息为空，这个时候将ISP的信息填入
+		if data.Owner == "" {
+			data.Owner = data.Isp
+		}
+		if data.District != "" {
+			data.City = data.City + ", " + data.District
+		}
+		if data.Prov == "" && data.City == "" {
+			// anyCast或是骨干网数据不应该有国家信息
+			data.Owner = data.Owner + ", " + data.Owner
+		} else {
+			// 非骨干网正常填入IP的国家信息数据
+			res = append(res, data.Country)
+		}
+
+		if data.Prov != "" {
+			res = append(res, data.Prov)
+		}
+		if data.City != "" {
+			res = append(res, data.City)
+		}
+
+		if data.Owner != "" {
+			res = append(res, data.Owner)
+		}
+	}
+
+	return strings.Join(res, ", ")
+}
--- a/trace/trace.go
+++ b/trace/trace.go
@@ -25,13 +25,15 @@ type Config struct {
 	Quic             bool
 	IPGeoSource      ipgeo.Source
 	RDns             bool
+	RealtimePrinter  func(res *Result, ttl int)
 }

 type Method string

 const (
-	UDPTrace Method = "udp"
-	TCPTrace Method = "tcp"
+	ICMPTrace Method = "icmp"
+	UDPTrace  Method = "udp"
+	TCPTrace  Method = "tcp"
 )

 type Tracer interface {
@@ -52,10 +54,26 @@ func Traceroute(method Method, config Config) (*Result, error) {
 	}

 	switch method {
+	case ICMPTrace:
+		if config.DestIP.To4() != nil {
+			tracer = &ICMPTracer{Config: config}
+		} else {
+			tracer = &ICMPTracerv6{Config: config}
+		}
+
 	case UDPTrace:
-		tracer = &UDPTracer{Config: config}
+		if config.DestIP.To4() != nil {
+			tracer = &UDPTracer{Config: config}
+		} else {
+			return nil, errors.New("IPv6 UDP Traceroute is not supported")
+		}
 	case TCPTrace:
-		tracer = &TCPTracer{Config: config}
+		if config.DestIP.To4() != nil {
+			tracer = &TCPTracer{Config: config}
+		} else {
+			// tracer = &TCPTracerv6{Config: config}
+			return nil, errors.New("IPv6 TCP Traceroute is not supported")
+		}
 	default:
 		return &Result{}, ErrInvalidMethod
 	}
--- a/trace/udp.go
+++ b/trace/udp.go
@@ -1,6 +1,11 @@
 package trace

 import (
+	"log"
+	"net"
+	"sync"
+	"time"
+
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
 	"github.com/xgadget-lab/nexttrace/util"
@@ -8,10 +13,6 @@ import (
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv4"
 	"golang.org/x/sync/semaphore"
-	"log"
-	"net"
-	"sync"
-	"time"
 )

 type UDPTracer struct {
@@ -99,8 +100,8 @@ func (t *UDPTracer) handleICMPMessage(msg ReceivedMessage, data []byte) {
 		return
 	}
 	srcPort := util.GetUDPSrcPort(header)
-	t.inflightRequestLock.Lock()
-	defer t.inflightRequestLock.Unlock()
+	//t.inflightRequestLock.Lock()
+	//defer t.inflightRequestLock.Unlock()
 	ch, ok := t.inflightRequest[int(srcPort)]
 	if !ok {
 		return
@@ -128,7 +129,6 @@ func (t *UDPTracer) getUDPConn(try int) (net.IP, int, net.PacketConn) {
 		}
 		return t.getUDPConn(try + 1)
 	}
-
 	return srcIP, udpConn.LocalAddr().(*net.UDPAddr).Port, udpConn
 }

@@ -184,6 +184,7 @@ func (t *UDPTracer) send(ttl int) error {
 		return err
 	}

+	// 在对inflightRequest进行写操作的时候应该加锁保护，以免多个goroutine协程试图同时写入造成panic
 	t.inflightRequestLock.Lock()
 	hopCh := make(chan Hop)
 	t.inflightRequest[srcPort] = hopCh
--- a/util/util.go
+++ b/util/util.go
@@ -36,12 +36,13 @@ func DomainLookUp(host string) net.IP {
 	var ipv6Flag = false

 	for _, ip := range ips {
+		ipSlice = append(ipSlice, ip)
 		// 仅返回ipv4的ip
-		if ip.To4() != nil {
-			ipSlice = append(ipSlice, ip)
-		} else {
-			ipv6Flag = true
-		}
+		// if ip.To4() != nil {
+		// 	ipSlice = append(ipSlice, ip)
+		// } else {
+		// 	ipv6Flag = true
+		// }
 	}

 	if ipv6Flag {
Author	SHA1	Message	Date
zhshch2002	cfc8034cb4	update: 允许参数后置	2022-05-27 10:26:32 +08:00
tsosunchia	dbc0f87847	Merge pull request #17 from tsosunchia/main 修改部分提示内容	2022-05-27 10:20:57 +08:00
tsosunchia	74a320898f	Merge remote-tracking branch 'refs/remotes/origin/main'	2022-05-27 10:19:40 +08:00
tsosunchia	329b3fdd6b	修改部分提示内容	2022-05-27 10:19:25 +08:00
tsosunchia	3fb88f4cf4	Merge branch 'xgadget-lab:main' into main	2022-05-27 10:12:59 +08:00
tsosunchia	1de84cac71	修改部分提示内容	2022-05-27 10:12:14 +08:00
sjlleo	83d093f5aa	fix: 修复一个 report 奔溃的问题	2022-05-27 10:08:28 +08:00
sjlleo	8b03ca7a38	update mod	2022-05-27 09:58:23 +08:00
tsosunchia	7a847bf0d5	Merge pull request #16 from tsosunchia/main update README.md 增加说明	2022-05-27 09:43:28 +08:00
tsosunchia	11fe41611c	update README.md 增加说明	2022-05-27 09:43:09 +08:00
tsosunchia	71b24fb7a0	Update README.md	2022-05-27 00:45:27 +08:00
tsosunchia	0b08e4b4a4	Merge pull request #15 from tsosunchia/main update quicklytest.sh 增加部分模式下的Route-Path打印	2022-05-26 23:31:35 +08:00
tsosunchia	2608c05da1	Update quicklytest.sh	2022-05-26 23:24:03 +08:00
tsosunchia	314bdd0cce	Update quicklytest.sh 启用-report	2022-05-26 23:07:14 +08:00
tsosunchia	ea958059c6	Merge branch 'main' into main	2022-05-26 23:02:49 +08:00
tsosunchia	b59c349264	Update README.md	2022-05-26 22:55:21 +08:00
tsosunchia	030a487526	Update README.md	2022-05-26 22:45:48 +08:00
tsosunchia	cac6d33fde	Update quicklytest.sh	2022-05-26 22:38:14 +08:00
tsosunchia	1725a65827	Update nt_install.sh	2022-05-26 22:38:01 +08:00
tsosunchia	4d886066a3	Update quicklytest.sh	2022-05-26 22:35:25 +08:00
tsosunchia	156043730d	Update nt_install.sh	2022-05-26 22:17:40 +08:00
tsosunchia	91ad3bc539	Update nt_install.sh	2022-05-26 22:03:01 +08:00
tsosunchia	351da5f5a3	Update nt_install.sh	2022-05-26 21:57:42 +08:00
tsosunchia	f8fc90d7a5	Update quicklytest.sh	2022-05-26 21:50:15 +08:00
tsosunchia	9c75635acc	Update nt_install.sh	2022-05-26 21:31:14 +08:00
sjlleo	b20b27fd20	update: 现在TCP SYN模式下也将打印路由跟踪结果	2022-05-26 21:29:17 +08:00
tsosunchia	cfc1dfdfe5	Update nt_install.sh 增加检查脚本更新功能	2022-05-26 21:28:12 +08:00
tsosunchia	97c4387af4	Update quicklytest.sh	2022-05-26 21:25:17 +08:00
tsosunchia	37b5202126	Update README.md	2022-05-26 21:08:39 +08:00
tsosunchia	afb6a3e1df	Update quicklytest.sh 增加自动检测更新功能	2022-05-26 21:02:19 +08:00
tsosunchia	c9a3916cd0	Update quicklytest.sh	2022-05-26 20:58:05 +08:00
tsosunchia	89d56c437e	Update quicklytest.sh	2022-05-26 20:43:06 +08:00
tsosunchia	6299dcd9a3	Update quicklytest.sh	2022-05-26 20:40:06 +08:00
tsosunchia	82f28a13f3	Update quicklytest.sh	2022-05-26 20:39:26 +08:00
tsosunchia	af732bc212	Update quicklytest.sh 增加脚本提示	2022-05-26 19:55:58 +08:00
tsosunchia	8d5f58bf15	Update quicklytest.sh	2022-05-26 19:46:54 +08:00
tsosunchia	8bd5654474	Update quicklytest.sh 增加TCP,UDP模式选项	2022-05-26 19:41:57 +08:00
tsosunchia	4de61823ee	Update nt_install.sh 整理排版	2022-05-26 17:36:44 +08:00
tsosunchia	39ec016d0d	Update nt_install.sh 重构结构	2022-05-26 17:30:09 +08:00
tsosunchia	67999411af	fix some bugs	2022-05-25 23:52:14 +08:00
tsosunchia	7cc6b71727	fix some bugs	2022-05-25 23:40:13 +08:00
tsosunchia	16ba835537	Merge pull request #14 from tsosunchia/main update quicklytest.sh some bugs fix	2022-05-25 18:50:09 +08:00
tsosunchia	1b7c3b8d0d	update quicklytest.sh some bugs fix	2022-05-25 18:49:43 +08:00
tsosunchia	bd47935a2d	Merge pull request #13 from tsosunchia/main 增删一些测试节点	2022-05-25 18:35:05 +08:00
tsosunchia	1f16001e4f	增删一些测试节点	2022-05-25 18:34:29 +08:00
sjlleo	f56e6cdba3	update: 整理排版	2022-05-25 18:15:26 +08:00
tsosunchia	ecd3df8ee8	Update quicklytest.sh 替换部分已不可使用的测试节点	2022-05-25 18:11:19 +08:00
zhshch2002	1658da1653	update: README.md img tag alt	2022-05-25 18:05:04 +08:00
zhshch2002	5110c9b990	fix: README.md typo	2022-05-25 18:04:13 +08:00
zhshch2002	aa446574f1	update: README.md screenshot.png	2022-05-25 18:02:47 +08:00
tsosunchia	2016990629	Update README.md	2022-05-25 17:50:17 +08:00
tsosunchia	e639b7b12d	Merge pull request #11 from tsosunchia/main update README.md 增加对quicklytest.sh的说明	2022-05-25 17:46:23 +08:00
tsosunchia	3cfe6598dd	update README.md 增加对quicklytest.sh的说明	2022-05-25 17:45:56 +08:00
tsosunchia	59193cae47	Merge pull request #10 from tsosunchia/main Some bugs fix	2022-05-25 17:30:40 +08:00
tsosunchia	1def15e805	some bugs fix	2022-05-25 17:30:13 +08:00
tsosunchia	1950032371	Merge branch 'xgadget-lab:main' into main	2022-05-25 17:25:58 +08:00
sjlleo	f81a0b3da3	update: 当 ip.sb 触发 cloudflare 5s 墙的时候自动退出	2022-05-25 17:25:26 +08:00
tsosunchia	9e3d4186a1	Merge pull request #1 from xgadget-lab/main add quicklytest.sh	2022-05-25 17:24:50 +08:00
tsosunchia	4737669436	add quicklytest.sh 修改自 https://github.com/KANIKIG/worst_testrace 一个快速的脚本测试你的服务器到中国的路由	2022-05-25 17:22:40 +08:00
sjlleo	dbecfd880d	update: 风控IP会直接退出，避免没有数据	2022-05-25 17:19:54 +08:00
tsosunchia	a67a4bc559	Update nt_install.sh	2022-05-25 17:08:56 +08:00
tsosunchia	077d72d5cd	Update nt_install.sh	2022-05-25 17:03:35 +08:00
zhshch2002	d45b5eb032	update: 减少GitHub Actions重复运行	2022-05-25 16:56:13 +08:00
zhshch2002	5fe1110ab3	update: 减少GitHub Actions重复运行	2022-05-25 16:52:26 +08:00
tsosunchia	812c953976	Delete bug_cn.md	2022-05-25 16:08:42 +08:00
tsosunchia	f89505ab87	Update issue templates	2022-05-25 16:08:00 +08:00
tsosunchia	640eb8c02d	Create bug_cn.md	2022-05-25 15:57:28 +08:00
tsosunchia	fc3462ff9e	Merge pull request #9 from tsosunchia/main update README.md 更改安装方法说明	2022-05-25 15:33:57 +08:00
tsosunchia	071a6b124a	update README.md 更改安装方法说明	2022-05-25 15:33:13 +08:00
tsosunchia	45a8cf21f6	Merge pull request #8 from tsosunchia/main add 添加定时更新任务功能	2022-05-25 15:18:53 +08:00
tsosunchia	1315efa4d2	Merge branch 'xgadget-lab:main' into main	2022-05-25 15:16:22 +08:00
tsosunchia	c2bd51faab	add 自动添加定时更新任务功能	2022-05-25 15:16:02 +08:00
sjlleo	f1ce2bbb77	update: 为什么我们要尝试自己维护骨干网的IP数据库	2022-05-25 14:43:02 +08:00
sjlleo	a18bf1889b	add: faq	2022-05-25 14:16:38 +08:00
tsosunchia	12c93de8c5	Merge pull request #6 from tsosunchia/main Implement update function	2022-05-25 14:04:09 +08:00
tsosunchia	8280b62881	Merge remote-tracking branch 'refs/remotes/origin/main'	2022-05-25 14:02:40 +08:00
tsosunchia	608847b1cb	Implement update function	2022-05-25 14:01:21 +08:00
tsosunchia	b4838ba402	Merge pull request #5 from tsosunchia/main 添加macOS BREW包管理器	2022-05-25 13:38:06 +08:00
tsosunchia	fbd70a8eb1	add BREW PACKAGE MANAGER	2022-05-25 13:36:54 +08:00
tsosunchia	fd1632fccb	Merge branch 'xgadget-lab:main' into main	2022-05-25 13:18:06 +08:00
zhshch2002	4a725d2c48	revert: `96bb323f` "update: test.yml"	2022-05-25 13:15:06 +08:00
zhshch2002	96bb323f72	update: test.yml	2022-05-25 13:09:30 +08:00
zhshch2002	961c29e499	fix: build sh version var	2022-05-25 13:04:18 +08:00
zhshch2002	870d1f3b5a	update: get version from git	2022-05-25 12:56:47 +08:00
sjlleo	ebd435db53	refactor: report 支持多线程和rDNS反查	2022-05-25 10:48:47 +08:00
sjlleo	53b2249ce5	fix: 尝试性修复部分 CentOS 6、Debian8 下 wget 安装失败	2022-05-25 08:13:57 +08:00
sjlleo	7215a1e2b7	update: 更新 NextTrace 最新的 CLI 参数	2022-05-24 21:33:18 +08:00
sjlleo	24b06d2fd7	fix: strange error	2022-05-24 21:10:28 +08:00
sjlleo	f1f95dff29	fix: route-path 显示不全的问题	2022-05-24 21:05:59 +08:00
zhshch2002	0d9b8c8861	fix: typo	2022-05-24 18:27:22 +08:00
zhshch2002	290524b502	add: Version print	2022-05-24 18:14:31 +08:00
sjlleo	905ef267f2	improve	2022-05-24 11:57:50 +08:00
sjlleo	9720c19153	add: route report	2022-05-24 11:57:10 +08:00
sjlleo	f2c494441b	Add files via upload	2022-05-24 11:45:02 +08:00
sjlleo	44aba64505	Delete screenshot2.png	2022-05-24 11:44:30 +08:00
sjlleo	c0be6774c1	Delete screenshot3.png	2022-05-24 11:44:19 +08:00
zhshch2002	23693895e4	update: GitHub actions build.yml	2022-05-24 11:22:13 +08:00
zhshch2002	7edebf938b	remove: test for TestIPSB api	2022-05-24 11:20:23 +08:00
zhshch2002	d4a176f864	add: test github actions	2022-05-24 11:17:43 +08:00
zhshch2002	69388c956e	remove: listener_channe, signal, taskgroup	2022-05-24 11:17:43 +08:00
sjlleo	738ff949b1	Special Version for my friends - missuo	2022-05-24 10:59:38 +08:00
sjlleo	b59f0eb9da	update: rdns 功能介绍	2022-05-24 09:21:30 +08:00
sjlleo	c7df49ca8e	improve: #4 case insensitive	2022-05-24 09:05:56 +08:00
sjlleo	4d3a52bb28	Add: IP Database Copyright	2022-05-24 08:55:41 +08:00
sjlleo	fbf7335bc8	update: "./" is no longer need here	2022-05-24 05:37:19 +08:00
tsosunchia	24eedfa3fe	Update nt_install.sh	2022-05-23 23:24:42 +08:00
sjlleo	d60c80e1ff	Add files via upload	2022-05-23 21:28:10 +08:00
sjlleo	4f622b7afb	Add files via upload	2022-05-23 21:27:50 +08:00
sjlleo	f51b07d388	Add files via upload	2022-05-23 21:17:43 +08:00
sjlleo	679dbbf01a	Delete screenshot2.png	2022-05-23 21:17:18 +08:00
sjlleo	2a5e5572b4	update: fix command not found bug	2022-05-23 21:03:44 +08:00
sjlleo	974655a1b3	update: todo update version	2022-05-23 20:55:11 +08:00
sjlleo	eb9844f924	Add: screenshots	2022-05-23 20:41:48 +08:00
sjlleo	b8a51b3c44	add: screenshots	2022-05-23 20:40:37 +08:00
sjlleo	5d984fc3ac	Merge pull request #3 from tsosunchia/main 对安装脚本一点小改善	2022-05-23 20:33:30 +08:00
tsosunchia	bcea9aa2cb	安装脚本增加checkVersion为之后增加自动更新功能做准备；优化了部分逻辑结构；在部分软件包管理器增加了安装依赖包之前更新软件源的步骤	2022-05-23 20:26:53 +08:00
sjlleo	ffc2c33e63	Merge pull request #2 from tsosunchia/main 修正安装脚本在macOS运行中出现的BUG	2022-05-23 19:55:39 +08:00
tsosunchia	919335133e	修正脚本在macOS运行中出现的BUG	2022-05-23 19:29:38 +08:00
sjlleo	4d0e3eb93d	update: 修改用法	2022-05-23 18:10:40 +08:00
sjlleo	56d2f0554f	update: sed is uncompatible in macOS, with 1:-1 instead (Thanks to nsnnns)	2022-05-23 18:07:48 +08:00
zhshch2002	e728b6b063	refactor: icmp	2022-05-23 17:35:40 +08:00
zhshch2002	8b2d2f3990	Merge branch 'main' of https://github.com/xgadget-lab/nexttrace	2022-05-23 17:01:15 +08:00
zhshch2002	4c51b2fbbe	add: realtime and table output mode Co-authored-by: sjlleo <sjlleo@users.noreply.github.com>	2022-05-23 17:00:24 +08:00
sjlleo	9a6586f27a	update: import jq package	2022-05-23 16:01:16 +08:00
sjlleo	cc8e3e4838	update: 修复命令在直接使用sudo的情况下不可用	2022-05-23 10:32:26 +08:00
sjlleo	d69b7b9acb	update: 新增国内镜像加速	2022-05-23 10:18:45 +08:00
sjlleo	483a90848d	update: fix a bash problem	2022-05-23 10:05:48 +08:00
sjlleo	131a9e2e8a	update: add some description	2022-05-23 09:47:06 +08:00
sjlleo	982e1064c2	update: sudo check first	2022-05-23 09:45:59 +08:00
sjlleo	5ff461af42	update: apt update first	2022-05-23 09:43:45 +08:00
sjlleo	8adc98a753	update: One-Key Install Script	2022-05-23 09:41:42 +08:00
sjlleo	937113ca33	add: 一键安装、升级脚本	2022-05-23 09:39:23 +08:00
zhshch2002	9f0c62506e	update: README.md 快速安装脚本	2022-05-22 21:47:56 +08:00
sjlleo	cad5f944cb	完善	2022-05-22 21:23:39 +08:00
sjlleo	0f0fb91fb6	Add: Thank Member	2022-05-22 20:26:48 +08:00
sjlleo	e1c6f1ccf6	add: Thanks Member	2022-05-22 20:23:05 +08:00
sjlleo	5ac811bbae	update: 完善ReadMe描述	2022-05-22 20:18:28 +08:00
zhshch2002	dbd8ae573c	Merge branch 'main' of https://github.com/xgadget-lab/nexttrace	2022-05-22 20:03:43 +08:00
sjlleo	8db4c5e7b8	Add: logo.svg file	2022-05-22 20:02:54 +08:00
zhshch2002	7db2a717a4	Merge branch 'main' of https://github.com/xgadget-lab/nexttrace	2022-05-22 20:02:47 +08:00
zhshch2002	b0ba116c91	update: README.md	2022-05-22 20:01:48 +08:00
sjlleo	5f993961ed	update: fix channel closed, printer imrove	2022-05-22 19:55:27 +08:00
sjlleo	ead46decf6	Add: IPv6 Traceroute	2022-05-22 15:38:05 +08:00
sjlleo	7712ebf953	Add mips	2022-05-19 14:58:09 +08:00
sjlleo	14bbc62358	Add linux mips release	2022-05-19 14:48:25 +08:00
sjlleo	4323021f96	Change Token	2022-05-19 14:31:26 +08:00
sjlleo	cbfb37f37b	Update build.yml	2022-05-19 14:00:50 +08:00
sjlleo	50d594e4df	Add: icmp trace	2022-05-19 13:35:50 +08:00