Merge pull request #182 from nxtrace/main

chore: 同步至v1.2.3

.github/workflows/build.yml

@@ -75,6 +75,12 @@ jobs:
  goarch: mipsle
  - goos: linux
  goarch: mips
+ - goos: linux
+ goarch: mipsle
+ gomips: softfloat
+ - goos: linux
+ goarch: mips
+ gomips: softfloat
  # END MIPS
  # BEGIN PPC
  - goos: linux
@@ -104,6 +110,7 @@ jobs:
  GOOS: ${{ matrix.goos }}
  GOARCH: ${{ matrix.goarch }}
  GOARM: ${{ matrix.goarm }}
+ GOMIPS: ${{ matrix.gomips }}
  CGO_ENABLED: 0
  steps:
  - name: Checkout codebase
@@ -117,7 +124,10 @@ jobs:
  if [ "$GOOS" == "windows" ]; then
  export _NAME="$_NAME.exe"
  fi
- echo "GOOS: $GOOS, GOARCH: $GOARCH, GOARM: $GOARM, RELEASE_NAME: $_NAME"
+ if [ "$GOMIPS" == "softfloat" ]; then
+ export _NAME="${_NAME}_softfolat"
+ fi
+ echo "GOOS: $GOOS, GOARCH: $GOARCH, GOARM: $GOARM, GOMIPS: $GOMIPS, RELEASE_NAME: $_NAME"
  echo "ASSET_NAME=$_NAME" >> $GITHUB_ENV
  echo "BUILD_VERSION=$(git describe --tags --always)" >> $GITHUB_ENV
  echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV

README.md

@@ -172,6 +172,17 @@ nexttrace --fast-trace
 
 # You can also use TCP SYN for testing
 nexttrace --fast-trace --tcp
+
+# You can also quickly test through a customized IP/DOMAIN list file
+nexttrace --file /path/to/your/iplist.txt
+# CUSTOMIZED IP DOMAIN LIST FILE FORMAT
+## One IP/DOMAIN per line + space + description information (optional)
+## forExample:
+## 106.37.67.1 BEIJING-TELECOM
+## 240e:928:101:31a::1 BEIJING-TELECOM
+## bj.10086.cn BEIJING-MOBILE
+## 2409:8080:0:1::1
+## 223.5.5.5
 ```
 
 `NextTrace` already supports route tracing for specified Network Devices
@@ -370,6 +381,7 @@ Arguments:
  aliyun, dnspod, google, cloudflare]
  -g --language Choose the language for displaying [en,
  cn]. Default: cn
+ --file Read IP Address or domain name from file
 ```
 
 ## Project screenshot

README_zh_CN.md

@@ -183,6 +183,17 @@ nexttrace --fast-trace
 
 # 也可以使用 TCP SYN 而非 ICMP 进行测试
 nexttrace --fast-trace --tcp
+
+# 也可以通过自定义的IP/DOMAIN列表文件进行快速测试
+nexttrace --file /path/to/your/iplist.txt
+# 自定义的IP/DOMAIN列表文件格式
+## 一行一个IP/DOMAIN + 空格 + 描述信息（可选）
+## 例如：
+## 106.37.67.1 北京电信
+## 240e:928:101:31a::1 北京电信
+## bj.10086.cn 北京移动
+## 2409:8080:0:1::1
+## 223.5.5.5
 ```
 
 `NextTrace` 已支持指定网卡进行路由跟踪
@@ -368,6 +379,7 @@ Arguments:
  aliyun, dnspod, google, cloudflare]
  -g --language Choose the language for displaying [en,
  cn]. Default: cn
+ --file Read IP Address or domain name from file
 ```
 
 ## 项目截图

cmd/cmd.go

@@ -69,6 +69,7 @@ func Excute() {
  Help: "Use DoT Server for DNS Parse [dnssb, aliyun, dnspod, google, cloudflare]"})
  lang := parser.Selector("g", "language", []string{"en", "cn"}, &argparse.Options{Default: "cn",
  Help: "Choose the language for displaying [en, cn]"})
+ file := parser.String("", "file", &argparse.Options{Help: "Read IP Address or domain name from file"})
 
  err := parser.Parse(os.Args)
  if err != nil {
@@ -91,7 +92,7 @@ func Excute() {
  *port = 80
  }
 
- if *fast_trace {
+ if *fast_trace || *file != "" {
  var paramsFastTrace = fastTrace.ParamsFastTrace{
  SrcDev: *srcDev,
  SrcAddr: *srcAddr,
@@ -102,6 +103,7 @@ func Excute() {
  Lang: *lang,
  PktSize: *packetSize,
  Timeout: time.Duration(*timeout) * time.Millisecond,
+ File: *file,
  }
 
  fastTrace.FastTest(*tcp, *output, paramsFastTrace)
@@ -176,21 +178,26 @@ func Excute() {
  //
  //go func() {
  // defer wg.Done()
+ err = nil
  if *udp {
  if *ipv6Only {
  fmt.Println("[Info] IPv6 UDP Traceroute is not supported right now.")
  os.Exit(0)
  }
- ip = util.DomainLookUp(domain, "4", *dot, *jsonPrint)
+ ip, err = util.DomainLookUp(domain, "4", *dot, *jsonPrint)
  } else {
  if *ipv6Only {
- ip = util.DomainLookUp(domain, "6", *dot, *jsonPrint)
+ ip, err = util.DomainLookUp(domain, "6", *dot, *jsonPrint)
  } else if *ipv4Only {
- ip = util.DomainLookUp(domain, "4", *dot, *jsonPrint)
+ ip, err = util.DomainLookUp(domain, "4", *dot, *jsonPrint)
  } else {
- ip = util.DomainLookUp(domain, "all", *dot, *jsonPrint)
+ ip, err = util.DomainLookUp(domain, "all", *dot, *jsonPrint)
  }
  }
+ if err != nil {
+ fmt.Println(err)
+ os.Exit(1)
+ }
  //}()
  //
  //wg.Wait()
@@ -218,7 +225,7 @@ func Excute() {
  printer.PrintTraceRouteNav(ip, domain, *dataOrigin, *maxHops, *packetSize)
  }
 
- var m trace.Method = ""
+ var m trace.Method
 
  switch {
  case *tcp:

fast_trace/fast_trace ipv6.go

@@ -13,45 +13,49 @@ import (
  "os/signal"
 )
 
-var pFastTracer ParamsFastTrace
+//var pFastTracer ParamsFastTrace
 
 func (f *FastTracer) tracert_v6(location string, ispCollection ISPCollection) {
- fp, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
+ fmt.Printf("%s『%s %s 』%s\n", printer.YELLOW_PREFIX, location, ispCollection.ISPName, printer.RESET_PREFIX)
+ fmt.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IPv6, f.ParamsFastTrace.MaxHops, f.ParamsFastTrace.PktSize)
+
+ ip, err := util.DomainLookUp(ispCollection.IPv6, "6", "", true)
  if err != nil {
- return
+ log.Fatal(err)
  }
- defer func(fp *os.File) {
- err := fp.Close()
- if err != nil {
- log.Fatal(err)
- }
- }(fp)
-
- log.SetOutput(fp)
- log.SetFlags(0)
- fmt.Printf("%s『%s %s 』%s\n", printer.YELLOW_PREFIX, location, ispCollection.ISPName, printer.RESET_PREFIX)
- log.Printf("『%s %s 』\n", location, ispCollection.ISPName)
- fmt.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IPv6, pFastTracer.MaxHops, pFastTracer.PktSize)
- log.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IPv6, pFastTracer.MaxHops, pFastTracer.PktSize)
- ip := util.DomainLookUp(ispCollection.IPv6, "6", "", true)
  var conf = trace.Config{
- BeginHop: pFastTracer.BeginHop,
+ BeginHop: f.ParamsFastTrace.BeginHop,
  DestIP: ip,
  DestPort: 80,
- MaxHops: pFastTracer.MaxHops,
+ MaxHops: f.ParamsFastTrace.MaxHops,
  NumMeasurements: 3,
  ParallelRequests: 18,
- RDns: pFastTracer.RDns,
- AlwaysWaitRDNS: pFastTracer.AlwaysWaitRDNS,
+ RDns: f.ParamsFastTrace.RDns,
+ AlwaysWaitRDNS: f.ParamsFastTrace.AlwaysWaitRDNS,
  PacketInterval: 100,
  TTLInterval: 500,
  IPGeoSource: ipgeo.GetSource("LeoMoeAPI"),
- Timeout: pFastTracer.Timeout,
- PktSize: pFastTracer.PktSize,
- Lang: pFastTracer.Lang,
+ Timeout: f.ParamsFastTrace.Timeout,
+ SrcAddr: f.ParamsFastTrace.SrcAddr,
+ PktSize: f.ParamsFastTrace.PktSize,
+ Lang: f.ParamsFastTrace.Lang,
  }
 
  if oe {
+ fp, err := os.OpenFile("/tmp/trace.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
+ if err != nil {
+ return
+ }
+ defer func(fp *os.File) {
+ err := fp.Close()
+ if err != nil {
+ log.Fatal(err)
+ }
+ }(fp)
+ log.SetOutput(fp)
+ log.SetFlags(0)
+ log.Printf("『%s %s 』\n", location, ispCollection.ISPName)
+ log.Printf("traceroute to %s, %d hops max, %d byte packets\n", ispCollection.IPv6, f.ParamsFastTrace.MaxHops, f.ParamsFastTrace.PktSize)
  conf.RealtimePrinter = tracelog.RealtimePrinter
  } else {
  conf.RealtimePrinter = printer.RealtimePrinter
@@ -63,7 +67,7 @@ func (f *FastTracer) tracert_v6(location string, ispCollection ISPCollection) {
  log.Fatal(err)
  }
 
- println()
+ fmt.Println()
 }
 
 func (f *FastTracer) testAll_v6() {
@@ -114,7 +118,6 @@ func FastTestv6(tm bool, outEnable bool, paramsFastTrace ParamsFastTrace) {
  var c string
 
  oe = outEnable
- pFastTracer = paramsFastTrace
 
  fmt.Println("您想测试哪些ISP的路由？\n1. 国内四网\n2. 电信\n3. 联通\n4. 移动\n5. 教育网\n6. 全部")
  fmt.Print("请选择选项：")
@@ -123,7 +126,9 @@ func FastTestv6(tm bool, outEnable bool, paramsFastTrace ParamsFastTrace) {
  c = "1"
  }
 
- ft := FastTracer{}
+ ft := FastTracer{
+ ParamsFastTrace: paramsFastTrace,
+ }
 
  // 建立 WebSocket 连接
  w := wshandle.New()