add: 对 Hop 的路由表展示

.cross_compile.sh

@@ -5,7 +5,7 @@ set -e
 DIST_PREFIX="nexttrace"
 DEBUG_MODE=${2}
 TARGET_DIR="dist"
-PLATFORMS="darwin/amd64 darwin/arm64 linux/386 linux/amd64 linux/arm64 linux/mips openbsd/amd64 openbsd/arm64 freebsd/amd64 freebsd/arm64"
+PLATFORMS="darwin/amd64 darwin/arm64 linux/386 linux/amd64 linux/arm64 linux/mips windows/amd64 windows/arm64 openbsd/amd64 openbsd/arm64 freebsd/amd64 freebsd/arm64"
 
 BUILD_VERSION="$(git describe --tags --always)"
 BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"

.github/workflows/build.yml

@@ -41,6 +41,8 @@ jobs:
             dist/nexttrace_linux_arm64
             dist/nexttrace_linux_armv7
             dist/nexttrace_linux_mips
+            dist/nexttrace_windows_amd64.exe
+            dist/nexttrace_windows_arm64.exe
             dist/nexttrace_openbsd_amd64
             dist/nexttrace_openbsd_arm64
             dist/nexttrace_freebsd_amd64

README.md

@@ -20,14 +20,16 @@ PS: Our Lite version does not provide OSM based geolocation visualization, we pr
 
 ```bash
 # Linux one-click install script
-bash <(curl -Ls https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh)
+bash <(curl -Ls https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh)
 
 # macOS brew install command
 brew tap xgadget-lab/nexttrace && brew install nexttrace
 ```
 
+Windows users please go to [Release Page](https://github.com/sjlleo/nexttrace/releases/latest) directly and download exe file.
+
 - `Release` provides compiled executables for many systems and architectures, if not, you can compile it yourself.
-- Some of the necessary dependencies of this project are not fully implemented in `Golang` on `Windows`, so currently `NextTrace` is not available on `Windows` platform.
+- Some of the necessary dependencies of this project are not fully implemented in `Golang` on `Windows`, so currently `NextTrace` is experimental on `Windows` platform.
 
 ### Get Started
 
@@ -54,6 +56,17 @@ nexttrace -f
 nexttrace -f -T
 ```
 
+`NextTrace` already supports route tracing for specified Network Devices
+
+```bash
+# Use eth0 network interface
+nexttrace -D eth0 2606:4700:4700::1111
+
+# Use eth0 network interface's IP
+# When using the network interface's IP for route tracing, note that the IP type to be traced should be the same as network interface's IP type (e.g. both IPv4)
+nexttrace -S 204.98.134.56 9.9.9.9
+```
+
 `NextTrace` can also use `TCP` and `UDP` protocols to perform `Traceroute` requests, but these protocols only supports `IPv4` now
 
 ```bash
@@ -117,6 +130,8 @@ nexttrace -T -q 2 -r 1 -table -report 2001:4860:4860::8888
 
 ### IP Database
 
+#### We use [bgp.tools](https://bgp.tools) as a data provider for routing tables.
+
 NextTrace BackEnd is now open-source.
 
 https://github.com/sjlleo/nexttrace-backend
@@ -154,7 +169,7 @@ Options:
 
 ## Project screenshot
 
-![NextTrace Screenshot](https://user-images.githubusercontent.com/13616352/185024251-e34b92e0-8a40-40ec-927a-d352c94e3f07.png)
+![NextTrace Screenshot](asset/nexttrace021.png)
 
 ## NextTrace Enhanced
 
@@ -164,13 +179,7 @@ The `Enhanced` version supports many functions that the `lite` version does not
 
 https://github.com/OwO-Network/nexttrace-enhanced
 
-## Donate
-
-In order to provide the most accurate IP geolocation as possible, the project team chose to build our own API (LeoMoeAPI) and purchased several IP geolocation data source APIs, and also fixed a lot of backbone IP geolocation errors, which cost a lot of time and money.
-
-You can choose to donate to us to support our continuous development, we would like to express our gratitude in advance.
-
-爱发电: https://afdian.net/@sjlleo
+# 
 
 ## FAQ Frequently Asked Questions
 
@@ -183,12 +192,14 @@ Here is our recommended troubleshooting process:
 
 ## JetBrain Support
 
-### This Project uses [JetBrain Open-Source Project License](https://jb.gg/OpenSourceSupport). We Proudly Develop By Goland.
+#### This Project uses [JetBrain Open-Source Project License](https://jb.gg/OpenSourceSupport). We Proudly Develop By Goland.
 
-![GoLand logo](https://resources.jetbrains.com/storage/products/company/brand/logos/GoLand.png)
+<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/GoLand.png" title="" alt="GoLand logo" width="331">
 
 ## Credits
 
+BGP.TOOLS provided some data support for this project and we would like to express our sincere gratitude.
+
 [Vincent Young](https://github.com/missuo) (i@yyt.moe)
 
 [Sam Sam](https://github.com/samleong123) (samsam123@samsam123.name.my)
@@ -197,44 +208,7 @@ Here is our recommended troubleshooting process:
 
 [waiting4new](https://github.com/waiting4new)
 
-[FFEE_CO](https://github.com/fkx4-p)
-
-## IP Database Copyright
-
-### IPv4 Database
-
-#### China
-
-| ISP                         | Type     | Data Source          | Proportion |
-|:---------------------------:|:--------:|:--------------------:|:----------:|
-| China Telecom/Unicom/Mobile | Backbone | Internet Enthusiasts | 10%        |
-| China Telecom/Unicom/Mobile | Local    | Avon Technology      | 90%        |
-
-#### WorldWide
-
-##### Tier 1
-
-| ISP    | Type     | Data Source     | Proportion |
-|:------:|:--------:|:---------------:|:----------:|
-| Tier 1 | Backbone | IPInfo          | 2%         |
-| Tier 1 | Backbone | Avon Technology | 3%         |
-| Tier 1 | Backbone | IPInSight       | 5%         |
-| Tier 1 | Local    | IPInSight       | 90%        |
-
-##### General
-
-| ISP     | Type     | Data Source | Proportion |
-|:-------:|:--------:|:-----------:|:----------:|
-| General | Backbone | IPInSight   | 5%         |
-| General | Local    | IPInSight   | 95%        |
-
-### IPv6 Database
-
-| ISP | Type | Data Source      | Proportion |
-|:---:|:----:|:----------------:|:----------:|
-| All | All  | IP2Location Lite | 100%       |
-
-This product includes IP2Location LITE data available from <a href="https://lite.ip2location.com">https://lite.ip2location.com</a>.
+[FFEE_CO](https://github.com/fkx4-p) 
 
 ### Others
 

README_zh_CN.md

@@ -18,17 +18,19 @@ PS: Lite 版本追求轻量化，并不提供基于高德地图 / OpenStreetMap
 
 ```bash
 # Linux 一键安装脚本
-bash <(curl -Ls https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh)
+bash <(curl -Ls https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh)
 
 # GHPROXY 镜像（国内使用）
-bash <(curl -Ls https://ghproxy.com/https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh)
+bash <(curl -Ls https://ghproxy.com/https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh)
 
 # macOS brew 安装命令
 brew tap xgadget-lab/nexttrace && brew install nexttrace
 ```
 
+Windows 用户请直接前往 [Release](https://github.com/sjlleo/nexttrace/releases/latest) 下载编译后的二进制 exe 文件。
+
 - `Release`里面为很多系统以及不同架构提供了编译好的二进制可执行文件，如果没有可以自行编译。
-- 一些本项目的必要依赖在`Windows`上`Golang`底层实现不完全，所以目前`NextTrace`在`Windows`平台不可用。
+- 一些本项目的必要依赖在`Windows`上`Golang`底层实现不完全，所以目前`NextTrace`在`Windows`平台出于实验性支持阶段。
 
 ### Get Started
 
@@ -55,6 +57,19 @@ nexttrace -f
 nexttrace -f -T
 ```
 
+`NextTrace` 已支持指定网卡进行路由跟踪
+
+```bash
+# 请注意 Lite 版本此参数不能和快速测试联用，如有需要请使用 enhanced 版本
+# 使用 eth0 网卡
+nexttrace -D eth0 2606:4700:4700::1111
+
+# 使用 eth0 网卡IP
+# 网卡 IP 可以使用 ip a 或者 ifconfig 获取
+# 使用网卡IP进行路由跟踪时需要注意跟踪的IP类型应该和网卡IP类型一致（如都为 IPv4）
+nexttrace -S 204.98.134.56 9.9.9.9
+```
+
 `NextTrace` 也可以使用`TCP`和`UDP`协议发起`Traceroute`请求，不过目前只支持`IPv4`
 
 ```bash
@@ -118,6 +133,8 @@ nexttrace -T -q 2 -r 1 -table -report 2001:4860:4860::8888
 
 ### IP 数据库
 
+我们使用[bgp.tools](https://bgp.tools)作为路由表功能的数据提供者。
+
 ✨NextTrace `LeoMoeAPI` 的后端也开源啦
 
 [GitHub - sjlleo/nexttrace-backend: NextTrace BackEnd](https://github.com/sjlleo/nexttrace-backend)
@@ -130,6 +147,10 @@ NextTrace 所有的的 IP 地理位置`API DEMO`可以参考[这里](https://git
 Usage of nexttrace:
       'nexttrace [options] <hostname>' or 'nexttrace <hostname> [option...]'
 Options:
+  -D string
+        Use the following Network Devices as the source address in outgoing packets
+  -S string
+        Use the following IP address as the source address in outgoing packets
   -T    Use TCP SYN for tracerouting (default port is 80)
   -U    Use UDP Package for tracerouting (default port is 53 in UDP)
   -V    Print Version
@@ -155,7 +176,7 @@ Options:
 
 ## 项目截图
 
-![NextTrace Screenshot](https://user-images.githubusercontent.com/13616352/185024251-e34b92e0-8a40-40ec-927a-d352c94e3f07.png)
+![NextTrace Screenshot](asset/nexttrace021.png)
 
 ## NextTrace Enhanced
 
@@ -165,25 +186,10 @@ Options:
 
 https://github.com/OwO-Network/nexttrace-enhanced
 
-## 捐助我们
-
-为了能够尽可能提供精准的 IP 地理位置，项目组选择了自建 API (LeoMoeAPI) 并购买了多家 IP 地理位置的数据源 API，同时也修正的大量的骨干网 IP 地理位置错误，这需要耗费大量的时间和金钱。
-
-您可以选择捐助我们，以支持我们的持续发展，在此先表示感谢了。
-
-爱发电：https://afdian.net/@sjlleo
-
-## FAQ 常见问题
-
-如果你在安装或者使用的时候遇到了问题，我们建议你不要把新建一个 `issue` 作为首选项
-
-以下是我们推荐的排错流程：
-
-1. 查看是否为常见问题 -> [前往 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)
-2. 疑似 BUG、或者功能建议 -> [前往 Github Issues](https://github.com/xgadget-lab/nexttrace/issues)
-
 ## Thanks
 
+BGP.TOOLS 提供了本项目的一些数据支持，在此表示由衷地感谢。
+
 [Vincent Young](https://github.com/missuo) (i@yyt.moe)
 
 [Sam Sam](https://github.com/samleong123) (samsam123@samsam123.name.my)
@@ -194,46 +200,6 @@ https://github.com/OwO-Network/nexttrace-enhanced
 
 [FFEE_CO](https://github.com/fkx4-p)
 
-## IP Database Copyright
-
-### IPv4 Database
-
-#### China
-
-| ISP      | 类型  | 数据源   | 占比  |
-|:--------:|:---:|:-----:|:---:|
-| 电信/联通/移动 | 骨干网 | 网络爱好者 | 10% |
-| 电信/联通/移动 | 城域网 | 埃文科技  | 90% |
-
-- 参与骨干网维护的朋友都是网络爱好者群体，尽管我们多名志愿者通过自己的网络进行了大量的勘测，但是由于信息不足，依旧存在很多错误。
-- 对于更高精度的朋友，我们依旧强烈推荐IPIP.NET，他们开发的Besttrace是目前质量最好的路由可视化软件，我们多数爱好者能有今天这样的骨干网初步认知都是归功于他们，在此特表感谢。
-
-#### WorldWide
-
-##### Tier 01
-
-| ISP     | 类型  | 数据源       | 占比  |
-|:-------:|:---:|:---------:|:---:|
-| Tier-01 | 骨干网 | IPInfo    | 2%  |
-| Tier-01 | 骨干网 | 埃文科技      | 3%  |
-| Tier-01 | 骨干网 | IPInSight | 5%  |
-| Tier-01 | 城域网 | IPInSight | 90% |
-
-##### Other ISP
-
-| ISP    | 类型  | 数据源       | 占比  |
-|:------:|:---:|:---------:|:---:|
-| Others | 骨干网 | IPInSight | 5%  |
-| Others | 城域网 | IPInSight | 95% |
-
-### IPv6 Database
-
-| ISP | 类型  | 数据源              | 占比   |
-|:---:|:---:|:----------------:|:----:|
-| All | 全部  | IP2Location Lite | 100% |
-
-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 数据错误，也请直接联系他们纠错。

fast_trace/basic.go

@@ -23,6 +23,7 @@ type BackBoneCollection struct {
 type ISPCollection struct {
 	ISPName string
 	IP      string
+	IPv6    string
 }
 
 const (
@@ -47,6 +48,7 @@ var Beijing = BackBoneCollection{
 	CT163: ISPCollection{
 		ISPName: CT163,
 		IP:      "106.37.67.1",
+		IPv6:    "240e:40:e002:1:a:3ee3:c00:0",
 	},
 
 	CU169: ISPCollection{
@@ -102,7 +104,8 @@ var Guangzhou = BackBoneCollection{
 	Location: "广州",
 	CT163: ISPCollection{
 		ISPName: CT163,
-		IP:      "106.37.67.1",
+		IP:      "14.116.225.60",
+		IPv6:    "240e:f9:8010::3:110:1",
 	},
 
 	CU169: ISPCollection{

fast_trace/fast_trace.go

@@ -11,6 +11,7 @@ import (
 	"github.com/xgadget-lab/nexttrace/ipgeo"
 	"github.com/xgadget-lab/nexttrace/printer"
 	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/xgadget-lab/nexttrace/tracelog"
 	"github.com/xgadget-lab/nexttrace/wshandle"
 )
 
@@ -18,9 +19,21 @@ type FastTracer struct {
 	TracerouteMethod trace.Method
 }
 
+var oe bool = 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 fp.Close()
+
+	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, 30 hops max, 32 byte packets\n", ispCollection.IP)
+	log.Printf("traceroute to %s, 30 hops max, 32 byte packets\n", ispCollection.IP)
 	ip := net.ParseIP(ispCollection.IP)
 	var conf = trace.Config{
 		BeginHop:         1,
@@ -35,7 +48,12 @@ func (f *FastTracer) tracert(location string, ispCollection ISPCollection) {
 	}
 
 	if f.TracerouteMethod == trace.ICMPTrace {
-		conf.RealtimePrinter = printer.RealtimePrinter
+		if oe {
+			conf.RealtimePrinter = tracelog.RealtimePrinter
+		} else {
+			conf.RealtimePrinter = printer.RealtimePrinter
+		}
+		
 	}
 
 	res, err := trace.Traceroute(f.TracerouteMethod, conf)
@@ -93,9 +111,11 @@ func (f *FastTracer) testEDU() {
 	f.tracert(TestIPsCollection.Hefei.Location, TestIPsCollection.Hefei.CST)
 }
 
-func FastTest(tm bool) {
+func FastTest(tm bool, outEnable bool) {
 	var c string
 
+	oe = outEnable
+
 	fmt.Println("您想测试哪些ISP的路由？\n1. 国内四网\n2. 电信\n3. 联通\n4. 移动\n5. 教育网")
 	fmt.Print("请选择选项：")
 	fmt.Scanln(&c)

go.mod

@@ -17,6 +17,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.13.0
 	github.com/gorilla/websocket v1.5.0
+	github.com/lionsoul2014/ip2region v2.10.0+incompatible
 	github.com/rodaine/table v1.0.1
 	github.com/stretchr/testify v1.7.1 // indirect
 	github.com/tidwall/gjson v1.14.2

go.sum

@@ -7,6 +7,8 @@ github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF
 github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
 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/lionsoul2014/ip2region v2.10.0+incompatible h1:HpgN+54Korm/I0xXNX6I6owmvAwtPxrcI6cHYqXKtLw=
+github.com/lionsoul2014/ip2region v2.10.0+incompatible/go.mod h1:+ZBN7PBoh5gG6/y0ZQ85vJDBe21WnfbRrQQwTfliJJI=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=

ipgeo/ip2region.go

@@ -0,0 +1,77 @@
+package ipgeo
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+
+	"github.com/lionsoul2014/ip2region/v1.0/binding/golang/ip2region"
+)
+
+const (
+	ipDataBasePath = "./ip2region.db"
+	defaultDownURL = "1"
+	originURL      = "https://ghproxy.com/?q=https://github.com/bqf9979/ip2region/blob/master/data/ip2region.db?raw=true"
+)
+
+func downloadDataBase() error {
+	fmt.Println("Downloading DataBase...")
+	resp, err := http.Get(originURL)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	// Create the file
+	out, err := os.Create(ipDataBasePath)
+	if err != nil {
+		return err
+	}
+	defer out.Close()
+
+	// Write the body to file
+	_, err = io.Copy(out, resp.Body)
+	return err
+}
+
+func IP2Region(ip string) (*IPGeoData, error) {
+	if _, err := os.Stat(ipDataBasePath); os.IsNotExist(err) {
+		if err = downloadDataBase(); err != nil {
+			panic("Download Failed!")
+		}
+	}
+	region, err := ip2region.New(ipDataBasePath)
+	if err != nil {
+		panic("Cannot find ip2region.db")
+	}
+	defer region.Close()
+	info, searchErr := region.MemorySearch(ip)
+	if searchErr != nil {
+		return &IPGeoData{}, errors.New("no results")
+	}
+
+	if info.Country == "0" {
+		info.Country = ""
+	}
+
+	if info.Province == "0" {
+		info.Province = ""
+	}
+
+	if info.City == "0" {
+		info.City = ""
+	}
+
+	if info.ISP == "0" {
+		info.ISP = ""
+	}
+
+	return &IPGeoData{
+		Owner:   info.ISP,
+		Country: info.Country,
+		Prov:    info.Province,
+		City:    info.City,
+	}, nil
+}

ipgeo/ipapicom.go

@@ -38,6 +38,6 @@ func IPApiCom(ip string) (*IPGeoData, error) {
 		Country:  res.Get("country").String(),
 		City:     res.Get("city").String(),
 		Prov:     res.Get("regionName").String(),
-		Isp:      res.Get("isp").String(),
+		Owner:    res.Get("isp").String(),
 	}, nil
 }

ipgeo/ipgeo.go

@@ -5,14 +5,19 @@ import (
 )
 
 type IPGeoData struct {
-	Asnumber string
-	Country  string
-	Prov     string
-	City     string
-	District string
-	Owner    string
-	Isp      string
-	Whois    string
+	IP       string              `json:"ip"`
+	Asnumber string              `json:"asnumber"`
+	Country  string              `json:"country"`
+	Prov     string              `json:"prov"`
+	City     string              `json:"city"`
+	District string              `json:"district"`
+	Owner    string              `json:"owner"`
+	Isp      string              `json:"isp"`
+	Domain   string              `json:"domain"`
+	Whois    string              `json:"whois"`
+	Prefix   string              `json:"prefix"`
+	Router   map[string][]string `json:"router"`
+	Source   string              `json:"source"`
 }
 
 type Source = func(ip string) (*IPGeoData, error)
@@ -29,6 +34,8 @@ func GetSource(s string) Source {
 		return IPApiCom
 	case "IPINFO":
 		return IPInfo
+	case "IP2REGION":
+		return IP2Region
 	default:
 		return LeoIP
 	}

ipgeo/ipinfo.go

@@ -31,6 +31,6 @@ func IPInfo(ip string) (*IPGeoData, error) {
 		Country:  country,
 		City:     res.Get("city").String(),
 		Prov:     res.Get("region").String(),
-		Isp:      res.Get("asn").Get("domain").String(),
+		Owner:    res.Get("asn").Get("domain").String(),
 	}, nil
 }

ipgeo/ipsb.go

@@ -37,6 +37,6 @@ func IPSB(ip string) (*IPGeoData, error) {
 		Country:  res.Get("country").String(),
 		City:     res.Get("city").String(),
 		Prov:     res.Get("region").String(),
-		Isp:      res.Get("isp").String(),
+		Owner:    res.Get("isp").String(),
 	}, nil
 }

ipgeo/leo.go

@@ -1,6 +1,7 @@
 package ipgeo
 
 import (
+	"encoding/json"
 	"errors"
 	"sync"
 	"time"
@@ -52,6 +53,9 @@ func receiveParse() {
 			domain = res.Get("owner").String()
 		}
 
+		m := make(map[string][]string)
+		json.Unmarshal([]byte(res.Get("router").String()), &m)
+
 		IPPools.pool[gjson.Parse(data).Get("ip").String()] <- IPGeoData{
 			Asnumber: res.Get("asnumber").String(),
 			Country:  res.Get("country").String(),
@@ -61,6 +65,8 @@ func receiveParse() {
 			Owner:    domain,
 			Isp:      res.Get("isp").String(),
 			Whois:    res.Get("whois").String(),
+			Prefix:   res.Get("prefix").String(),
+			Router:   m,
 		}
 	}
 }

main.go

@@ -7,6 +7,7 @@ import (
 	"net"
 	"os"
 	"os/signal"
+	"runtime"
 	"strings"
 	"time"
 
@@ -15,6 +16,7 @@ import (
 	"github.com/xgadget-lab/nexttrace/printer"
 	"github.com/xgadget-lab/nexttrace/reporter"
 	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/xgadget-lab/nexttrace/tracelog"
 	"github.com/xgadget-lab/nexttrace/util"
 	"github.com/xgadget-lab/nexttrace/wshandle"
 )
@@ -30,12 +32,14 @@ var maxHops = fSet.Int("m", 30, "Set the max number of hops (max TTL to be reach
 var dataOrigin = fSet.String("d", "LeoMoeAPI", "Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight, IPAPI.com]")
 var noRdns = fSet.Bool("n", false, "Disable IP Reverse DNS lookup")
 var routePath = fSet.Bool("report", false, "Route Path")
+var output = fSet.Bool("o", false, "Ouput trace result to file (RealTimePrinter ONLY")
 var tablePrint = fSet.Bool("table", false, "Output trace results as table")
 var classicPrint = fSet.Bool("classic", false, "Classic Output trace results like BestTrace")
 var beginHop = fSet.Int("b", 1, "Set The Begin TTL")
 var ver = fSet.Bool("V", false, "Print Version")
 var src_addr = fSet.String("S", "", "Use the following IP address as the source address in outgoing packets")
 var src_dev = fSet.String("D", "", "Use the following Network Devices as the source address in outgoing packets")
+var router = fSet.Bool("R", false, "Show Routing Table [Provided By BGP.Tools]")
 
 func printArgHelp() {
 	fmt.Println("\nArgs Error\nUsage : 'nexttrace [option...] HOSTNAME' or 'nexttrace HOSTNAME [option...]'\nOPTIONS: [-VTU] [-d DATAORIGIN.STR ] [ -m TTL ] [ -p PORT ] [ -q PROBES.COUNT ] [ -r PARALLELREQUESTS.COUNT ] [-rdns] [ -table ] -report")
@@ -68,7 +72,11 @@ func flagApply() string {
 
 	// -f Fast Test
 	if *fastTest {
-		fastTrace.FastTest(*tcpSYNFlag)
+		fastTrace.FastTest(*tcpSYNFlag, *output)
+		if *output {
+			fmt.Println("您的追踪日志已经存放在 /tmp/trace.log 中")
+		}
+
 		os.Exit(0)
 	}
 
@@ -82,12 +90,16 @@ func main() {
 
 	domain := flagApply()
 
-	if os.Getuid() != 0 {
+	if os.Getuid() != 0 && runtime.GOOS != "windows" {
 		log.Fatalln("Traceroute requires root/sudo privileges.")
 	}
 
 	var ip net.IP
 
+	if runtime.GOOS == "windows" && (*tcpSYNFlag || *udpPackageFlag) {
+		fmt.Println("NextTrace 基于 Windows 的路由跟踪还在早期开发阶段，目前还存在诸多问题，TCP/UDP SYN 包请求可能不能正常运行")
+	}
+
 	if *tcpSYNFlag || *udpPackageFlag {
 		ip = util.DomainLookUp(domain, true)
 	} else {
@@ -149,7 +161,14 @@ func main() {
 		if *classicPrint {
 			conf.RealtimePrinter = printer.ClassicPrinter
 		} else {
-			conf.RealtimePrinter = printer.RealtimePrinter
+			if *output {
+				conf.RealtimePrinter = tracelog.RealtimePrinter
+			} else if *router {
+				conf.RealtimePrinter = printer.RealtimePrinterWithRouter
+				fmt.Println("路由表数据源由 BGP.Tools 提供，在此特表感谢")
+			} else {
+				conf.RealtimePrinter = printer.RealtimePrinter
+			}
 		}
 	}
 

nt_install.sh

@@ -82,7 +82,7 @@ checkWgetPackage() {
 downloadBinrayFile() {
     echo -e "${Info} 获取最新版的 NextTrace 发行版文件信息"
     # 简单说明一下，Github提供了一个API，可以获取最新发行版本的二进制文件下载地址（对应的是browser_download_url），根据刚刚测得的osDistribution、archParam，获取对应的下载地址
-    latestURL=$(curl -s https://api.github.com/repos/xgadget-lab/nexttrace/releases/latest | grep -i "browser_download_url.*${osDistribution}.*${archParam}" | awk -F '"' '{print $4}')
+    latestURL=$(curl -s https://api.github.com/repos/sjlleo/nexttrace/releases/latest | grep -i "browser_download_url.*${osDistribution}.*${archParam}" | awk -F '"' '{print $4}')
     
     if [ "$countryCode" == "CN" ]; then
         echo -e "${Info} 检测到国内环境，正在使用镜像下载"

printer/realtime_printer.go

@@ -92,7 +92,7 @@ func RealtimePrinter(res *trace.Result, ttl int) {
 				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.City),
 				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.District),
 				fmt.Sprintf("%-6s", res.Hops[ttl][i].Geo.Owner),
-				color.New(color.FgHiBlack, color.Bold).Sprintf("%-39s", res.Hops[ttl][0].Hostname),
+				color.New(color.FgHiBlack, color.Bold).Sprintf("%-39s", res.Hops[ttl][i].Hostname),
 			)
 		} else {
 			fmt.Fprintf(color.Output, " %s %s %s %s %s\n    %s   ",
@@ -101,7 +101,7 @@ func RealtimePrinter(res *trace.Result, ttl int) {
 				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.City),
 				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.District),
 				fmt.Sprintf("%-6s", res.Hops[ttl][i].Geo.Owner),
-				color.New(color.FgHiBlack, color.Bold).Sprintf("%-32s", res.Hops[ttl][0].Hostname),
+				color.New(color.FgHiBlack, color.Bold).Sprintf("%-32s", res.Hops[ttl][i].Hostname),
 			)
 		}
 

printer/realtime_printer_router.go

@@ -0,0 +1,152 @@
+package printer
+
+import (
+	"fmt"
+	"net"
+	"strconv"
+	"strings"
+
+	"github.com/fatih/color"
+	"github.com/xgadget-lab/nexttrace/trace"
+)
+
+func RealtimePrinterWithRouter(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)
+	for i, v := range res.Hops[ttl] {
+		if v.Address == nil && latestIP != "" {
+			tmpMap[latestIP] = append(tmpMap[latestIP], fmt.Sprintf("%s ms", "*"))
+			continue
+		} else if v.Address == nil {
+			continue
+		}
+
+		if _, exist := tmpMap[v.Address.String()]; !exist {
+			tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], strconv.Itoa(i))
+			// 首次进入
+			if latestIP == "" {
+				for j := 0; j < i; j++ {
+					tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], fmt.Sprintf("%s ms", "*"))
+				}
+			}
+			latestIP = v.Address.String()
+		}
+
+		tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], fmt.Sprintf("%.2f ms", v.RTT.Seconds()*1000))
+	}
+
+	if latestIP == "" {
+		fmt.Fprintf(color.Output, "%s\n",
+			color.New(color.FgWhite, color.Bold).Sprintf("*"),
+		)
+		return
+	}
+
+	var blockDisplay = false
+	for ip, v := range tmpMap {
+		if blockDisplay {
+			fmt.Printf("%4s", "")
+		}
+		if net.ParseIP(ip).To4() == nil {
+			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("%-15s", ip),
+			)
+		}
+
+		i, _ := strconv.Atoi(v[0])
+
+		if res.Hops[ttl][i].Geo.Asnumber != "" {
+			fmt.Fprintf(color.Output, " %s", color.New(color.FgHiGreen, color.Bold).Sprintf("AS%-6s", res.Hops[ttl][i].Geo.Asnumber))
+		} else {
+			fmt.Printf(" %-8s", "*")
+		}
+
+		if net.ParseIP(ip).To4() != nil {
+			whoisFormat := strings.Split(res.Hops[ttl][i].Geo.Whois, "-")
+			if len(whoisFormat) > 1 {
+				whoisFormat[0] = strings.Join(whoisFormat[:2], "-")
+			}
+
+			if whoisFormat[0] != "" {
+				whoisFormat[0] = "[" + whoisFormat[0] + "]"
+			}
+			fmt.Fprintf(color.Output, " %s", color.New(color.FgHiGreen, color.Bold).Sprintf("%-16s", whoisFormat[0]))
+		}
+
+		if res.Hops[ttl][i].Geo.Country == "" {
+			res.Hops[ttl][i].Geo.Country = "LAN Address"
+		}
+
+		if net.ParseIP(ip).To4() != nil {
+
+			fmt.Fprintf(color.Output, " %s %s %s %s %s\n    %s   ",
+				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Country),
+				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Prov),
+				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.City),
+				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.District),
+				fmt.Sprintf("%-6s", res.Hops[ttl][i].Geo.Owner),
+				color.New(color.FgHiBlack, color.Bold).Sprintf("%-39s", res.Hops[ttl][i].Hostname),
+			)
+		} else {
+			fmt.Fprintf(color.Output, " %s %s %s %s %s\n    %s   ",
+				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Country),
+				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Prov),
+				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.City),
+				color.New(color.FgWhite, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.District),
+				fmt.Sprintf("%-6s", res.Hops[ttl][i].Geo.Owner),
+				color.New(color.FgHiBlack, color.Bold).Sprintf("%-32s", res.Hops[ttl][i].Hostname),
+			)
+		}
+
+		for j := 1; j < len(v); j++ {
+			if len(v) == 2 || j == 1 {
+				fmt.Fprintf(color.Output, "%s",
+					color.New(color.FgHiCyan, color.Bold).Sprintf("%s", v[j]),
+				)
+			} else {
+				fmt.Fprintf(color.Output, " / %s",
+					color.New(color.FgHiCyan, color.Bold).Sprintf("%s", v[j]),
+				)
+			}
+		}
+		i = 0
+		fmt.Println()
+		if res.Hops[ttl][i].Geo != nil && !blockDisplay {
+			fmt.Fprintf(color.Output, "%s   %s %s %s   %s\n",
+				color.New(color.FgWhite, color.Bold).Sprintf("-"),
+				color.New(color.FgHiYellow, color.Bold).Sprintf("%s", res.Hops[ttl][i].Geo.Prefix),
+				color.New(color.FgWhite, color.Bold).Sprintf("路由表"),
+				color.New(color.FgHiCyan, color.Bold).Sprintf("Beta"),
+				color.New(color.FgWhite, color.Bold).Sprintf("-"),
+			)
+			GetRouter(&res.Hops[ttl][i].Geo.Router, "AS"+res.Hops[ttl][i].Geo.Asnumber)
+		}
+		blockDisplay = true
+	}
+}
+
+func GetRouter(r *map[string][]string, node string) {
+	routeMap := *r
+	for _, v := range routeMap[node] {
+		if len(routeMap[v]) != 0 {
+			fmt.Fprintf(color.Output, "    %s %s %s\n",
+				color.New(color.FgWhite, color.Bold).Sprintf("%s", routeMap[v][0]),
+				color.New(color.FgWhite, color.Bold).Sprintf("%s", v),
+				color.New(color.FgHiBlue, color.Bold).Sprintf("%s", node),
+			)
+		} else {
+			fmt.Fprintf(color.Output, "    %s %s\n",
+				color.New(color.FgWhite, color.Bold).Sprintf("%s", v),
+				color.New(color.FgHiBlue, color.Bold).Sprintf("%s", node),
+			)
+		}
+
+	}
+}

tracelog/log.go

@@ -0,0 +1,111 @@
+package tracelog
+
+import (
+	"fmt"
+	"io"
+	"log"
+	"net"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/xgadget-lab/nexttrace/trace"
+)
+
+func RealtimePrinter(res *trace.Result, ttl int) {
+	f, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
+	if err != nil {
+		return
+	}
+	defer f.Close()
+
+	multiWriter := io.MultiWriter(os.Stdout, f)
+	log.SetOutput(multiWriter)
+	log.SetFlags(0)
+	var res_str string
+	res_str += fmt.Sprintf("%-2d  ", ttl+1)
+
+	// 去重
+	var latestIP string
+	tmpMap := make(map[string][]string)
+	for i, v := range res.Hops[ttl] {
+		if v.Address == nil && latestIP != "" {
+			tmpMap[latestIP] = append(tmpMap[latestIP], fmt.Sprintf("%s ms", "*"))
+			continue
+		} else if v.Address == nil {
+			continue
+		}
+
+		if _, exist := tmpMap[v.Address.String()]; !exist {
+			tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], strconv.Itoa(i))
+			// 首次进入
+			if latestIP == "" {
+				for j := 0; j < i; j++ {
+					tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], fmt.Sprintf("%s ms", "*"))
+				}
+			}
+			latestIP = v.Address.String()
+		}
+
+		tmpMap[v.Address.String()] = append(tmpMap[v.Address.String()], fmt.Sprintf("%.2f ms", v.RTT.Seconds()*1000))
+	}
+
+	if latestIP == "" {
+		res_str += fmt.Sprintf("%s\n", "*")
+		log.Print(res_str)
+		return
+	}
+
+	var blockDisplay = false
+	for ip, v := range tmpMap {
+		if blockDisplay {
+			res_str += fmt.Sprintf("%4s", "")
+		}
+		if net.ParseIP(ip).To4() == nil {
+			res_str += fmt.Sprintf("%-25s ", ip)
+		} else {
+			res_str += fmt.Sprintf("%-15s ", ip)
+		}
+
+		i, _ := strconv.Atoi(v[0])
+
+		if res.Hops[ttl][i].Geo.Asnumber != "" {
+			res_str += fmt.Sprintf("AS%-7s", res.Hops[ttl][i].Geo.Asnumber)
+		} else {
+			res_str += fmt.Sprintf(" %-8s", "*")
+		}
+
+		if net.ParseIP(ip).To4() != nil {
+			whoisFormat := strings.Split(res.Hops[ttl][i].Geo.Whois, "-")
+			if len(whoisFormat) > 1 {
+				whoisFormat[0] = strings.Join(whoisFormat[:2], "-")
+			}
+
+			if whoisFormat[0] != "" {
+				whoisFormat[0] = "[" + whoisFormat[0] + "]"
+			}
+			res_str += fmt.Sprintf("%-16s", whoisFormat[0])
+		}
+
+		if res.Hops[ttl][i].Geo.Country == "" {
+			res.Hops[ttl][i].Geo.Country = "LAN Address"
+		}
+
+		if net.ParseIP(ip).To4() != nil {
+
+			res_str += fmt.Sprintf(" %s %s %s %s %-6s\n    %-39s   ", res.Hops[ttl][i].Geo.Country, res.Hops[ttl][i].Geo.Prov, res.Hops[ttl][i].Geo.City, res.Hops[ttl][i].Geo.District, res.Hops[ttl][i].Geo.Owner, res.Hops[ttl][i].Hostname)
+		} else {
+			res_str += fmt.Sprintf(" %s %s %s %s %-6s\n    %-35s ", res.Hops[ttl][i].Geo.Country, res.Hops[ttl][i].Geo.Prov, res.Hops[ttl][i].Geo.City, res.Hops[ttl][i].Geo.District, res.Hops[ttl][i].Geo.Owner, res.Hops[ttl][i].Hostname)
+		}
+
+		for j := 1; j < len(v); j++ {
+			if len(v) == 2 || j == 1 {
+				res_str += v[j]
+			} else {
+				res_str += fmt.Sprintf("/ %s", v[j])
+			}
+		}
+		log.Print(res_str)
+		blockDisplay = true
+	}
+}