fix bug:fasttrace也进行nslookup

nxtrace · May 29, 2023 · 23d20de · 23d20de
1 parent bf4ec99
commit 23d20de
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/fast_trace/fast_trace ipv6.go b/fast_trace/fast_trace ipv6.go
@@ -2,8 +2,8 @@ package fastTrace
 
 import (
 	"fmt"
+	"github.com/xgadget-lab/nexttrace/util"
 	"log"
-	"net"
 	"os"
 	"os/signal"
 	"time"
@@ -33,7 +33,7 @@ func (f *FastTracer) tracert_v6(location string, ispCollection ISPCollection) {
 	log.Printf("『%s %s 』\n", location, ispCollection.ISPName)
 	fmt.Printf("traceroute to %s, 30 hops max, 32 byte packets\n", ispCollection.IPv6)
 	log.Printf("traceroute to %s, 30 hops max, 32 byte packets\n", ispCollection.IPv6)
-	ip := net.ParseIP(ispCollection.IPv6)
+	ip := util.DomainLookUp(ispCollection.IP, false, "", true)
 	var conf = trace.Config{
 		BeginHop:         1,
 		DestIP:           ip,

diff --git a/fast_trace/fast_trace.go b/fast_trace/fast_trace.go
@@ -2,8 +2,8 @@ package fastTrace
 
 import (
 	"fmt"
+	"github.com/xgadget-lab/nexttrace/util"
 	"log"
-	"net"
 	"os"
 	"os/signal"
 	"time"
@@ -39,7 +39,7 @@ func (f *FastTracer) tracert(location string, ispCollection ISPCollection) {
 	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)
+	ip := util.DomainLookUp(ispCollection.IP, true, "", true)
 	var conf = trace.Config{
 		BeginHop:         1,
 		DestIP:           ip,

diff --git a/util/util.go b/util/util.go
@@ -46,6 +46,7 @@ func LocalIPPortv6(dstip net.IP) (net.IP, int) {
 }
 
 func DomainLookUp(host string, ipv4Only bool, dotServer string, disableOutput bool) net.IP {
+	// TODO: IPv4Only功能
 	var (
 		r   *net.Resolver
 		ips []net.IP
@@ -74,26 +75,24 @@ func DomainLookUp(host string, ipv4Only bool, dotServer string, disableOutput bo
 		os.Exit(1)
 	}
 
-	var ipv6Flag = false
+	//var ipv6Flag = false
+	//TODO: 此处代码暂无意义
+	//if ipv6Flag {
+	//	fmt.Println("[Info] IPv6 UDP Traceroute is not supported right now.")
+	//	if len(ips) == 0 {
+	//		os.Exit(0)
+	//	}
+	//}
 
-	if ipv6Flag {
-		fmt.Println("[Info] IPv6 UDP Traceroute is not supported right now.")
-		if len(ips) == 0 {
-			os.Exit(0)
-		}
-	}
-
-	if len(ips) == 1 {
+	if (len(ips) == 1) || (disableOutput) {
 		return ips[0]
 	} else {
 		fmt.Println("Please Choose the IP You Want To TraceRoute")
 		for i, ip := range ips {
-			if !disableOutput {
-				fmt.Fprintf(color.Output, "%s %s\n",
-					color.New(color.FgHiYellow, color.Bold).Sprintf("%d.", i),
-					color.New(color.FgWhite, color.Bold).Sprintf("%s", ip),
-				)
-			}
+			fmt.Fprintf(color.Output, "%s %s\n",
+				color.New(color.FgHiYellow, color.Bold).Sprintf("%d.", i),
+				color.New(color.FgWhite, color.Bold).Sprintf("%s", ip),
+			)
 		}
 		var index int
 		fmt.Printf("Your Option: ")