fix: strange error

.github/workflows/build.yml

@@ -5,13 +5,27 @@ on:
 
 name: 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 ./...
+
+  release:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-go@v2
+        with:
+          go-version: "1.18"
 
       - run: bash .cross_compile.sh
 

.github/workflows/test.yml

@@ -0,0 +1,17 @@
+on:
+  push:
+  pull_request:
+
+name: Test
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-go@v2
+        with:
+          go-version: "1.18"
+
+      - name: Test
+        run: go test -v -coverprofile='coverage.out' -covermode=count ./...

README.md

@@ -27,6 +27,9 @@ nexttrace 1.0.0.1
 # 获得 route-path
 nexttrace -report 1.0.0.1
 
+# 打开IP反向解析 rdns
+nexttrace -rdns 1.0.0.1
+
 # 表格打印（一次性输出全部跳数，需等待20-40秒）
 nexttrace -table 1.0.0.1
 
@@ -81,12 +84,20 @@ Usage of nexttrace:
 ```
 ## 项目截图
 
-![](asset/screenshot2.png)
-
-![](asset/screenshot3.png)
+![](asset/screenshot_special.png)
 
 ![](asset/screenshot.png)
 
+## History
+
+- v0.0.6.alpha - Now
+  - https://github.com/xgadget-lab/nexttrace
+  - 因为项目计划调整，更名并转移到当前仓库。重构了部分代码，提高了效率，增加了ICMP(IPv4 & IPv6)支持，并规划了更多功能。
+- 最初版本 - v0.0.5.alpha
+  - https://github.com/OwO-Network/traceroute
+  - 感谢 Leo (leo.moe) & Vincent (vincent.moe) 发起了这个项目，并完成了最初的工作。
+
+
 ## Thanks
 
 [Sam Sam](https://github.com/samleong123) (samsam123@samsam123.name.my)

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) {

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()
-}

main.go

@@ -25,9 +25,14 @@ var rdnsenable = flag.Bool("rdns", false, "Set whether rDNS will be display")
 var routePath = flag.Bool("report", false, "Route Path")
 var realtimePrint = flag.Bool("realtime", false, "Output trace results in runtime")
 var tablePrint = flag.Bool("table", false, "Output trace results as table")
+var ver = flag.Bool("V", false, "Check Version")
 
 func flagApply() string {
 	flag.Parse()
+	printer.Version()
+	if *ver {
+		os.Exit(0)
+	}
 	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>")
@@ -37,11 +42,13 @@ func flagApply() string {
 }
 
 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)
 

printer/basic.go

@@ -5,6 +5,11 @@ import (
 	"net"
 )
 
+func Version() {
+	fmt.Print("NextTrace v0.1.2-Beta ") // TODO get version from git
+	fmt.Println("XGadget-lab Leo (leo.moe) & Vincent (vincent.moe) & zhshch (xzhsh.ch)")
+}
+
 func PrintTraceRouteNav(ip net.IP, domain string, dataOrigin string) {
 	fmt.Println("IP Geo Data Provider: " + dataOrigin)
 

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)
+}

printer/tableprinter.go

@@ -2,6 +2,7 @@ package printer
 
 import (
 	"fmt"
+	"github.com/xgadget-lab/nexttrace/ipgeo"
 	"strings"
 
 	"github.com/xgadget-lab/nexttrace/trace"
@@ -89,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,

reporter/reporter.go

@@ -62,15 +62,19 @@ func (r *reporter) generateRouteReportNode(ip string, ipGeoData ipgeo.IPGeoData)
 		rpn.asn = ipGeoData.Asnumber
 	}
 	// 无论最后一跳是否为存在地理位置信息（AnyCast），都应该给予显示
-	if ipGeoData.Country == "" || ipGeoData.City == "" || ipGeoData.City == "-" && ip != r.targetIP {
+	if (ipGeoData.Country == "" || ipGeoData.Country == "LAN Address" || ipGeoData.Country == "-") && ip != r.targetIP {
 		return rpn, errors.New("GeoData Search Failed")
 	} 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 {

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()
 }

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
-}

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
-}

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 {

trace/tcp_ipv6.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"
@@ -111,10 +110,7 @@ func (t *TCPTracerv6) listenICMP() {
 // @title    listenTCP
 // @description   监听TCP的响应数据包
 func (t *TCPTracerv6) listenTCP() {
-	lc := listener_channel.New(t.tcp)
-
-	defer lc.Stop()
-
+	lc := NewPacketListener(t.tcp, t.ctx)
 	go lc.Start()
 
 	for {