From 3045cc198add52637b7e151e18fe049dadb325a2 Mon Sep 17 00:00:00 2001 From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com> Date: Mon, 11 Aug 2025 02:15:22 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=9A=E6=AC=A1=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E5=8F=96=E5=B9=B3=E5=9D=87=EF=BC=8C=E8=BE=93=E5=87=BA=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E6=8F=90=E5=8F=96=E5=88=B0=E6=9C=80=E5=A4=96=E5=B1=82?= =?UTF-8?q?=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bk/trace_ipv4.go | 59 ++++++++++++++++++++++++++++-------------------- bk/trace_ipv6.go | 59 ++++++++++++++++++++++++++++-------------------- 2 files changed, 70 insertions(+), 48 deletions(-) diff --git a/bk/trace_ipv4.go b/bk/trace_ipv4.go index e899663..eef5e87 100644 --- a/bk/trace_ipv4.go +++ b/bk/trace_ipv4.go @@ -4,6 +4,7 @@ import ( "fmt" "net" "strings" + "sync" "github.com/oneclickvirt/backtrace/model" . "github.com/oneclickvirt/defaultset" @@ -64,38 +65,48 @@ func trace(ch chan Result, i int) { } var allHops [][]*Hop var successfulTraces int - // 尝试3次trace + var mu sync.Mutex + var wg sync.WaitGroup + // 并发执行3次trace for attempt := 1; attempt <= 3; attempt++ { - if model.EnableLoger { - Logger.Info(fmt.Sprintf("第%d次尝试追踪 %s (%s)", attempt, model.Ipv4Names[i], model.Ipv4s[i])) - } - // 先尝试原始IP地址 - hops, err := Trace(net.ParseIP(model.Ipv4s[i])) - if err != nil { + wg.Add(1) + go func(attemptNum int) { + defer wg.Done() if model.EnableLoger { - Logger.Warn(fmt.Sprintf("第%d次追踪 %s (%s) 失败: %v", attempt, model.Ipv4Names[i], model.Ipv4s[i], err)) + Logger.Info(fmt.Sprintf("第%d次尝试追踪 %s (%s)", attemptNum, model.Ipv4Names[i], model.Ipv4s[i])) } - // 如果原始IP失败，尝试备选IP - if tryAltIPs := tryAlternativeIPs(model.Ipv4Names[i], "v4"); len(tryAltIPs) > 0 { - for _, altIP := range tryAltIPs { - if model.EnableLoger { - Logger.Info(fmt.Sprintf("第%d次尝试备选IP %s 追踪 %s", attempt, altIP, model.Ipv4Names[i])) - } - hops, err = Trace(net.ParseIP(altIP)) - if err == nil && len(hops) > 0 { - break // 成功找到可用IP + // 先尝试原始IP地址 + hops, err := Trace(net.ParseIP(model.Ipv4s[i])) + if err != nil { + if model.EnableLoger { + Logger.Warn(fmt.Sprintf("第%d次追踪 %s (%s) 失败: %v", attemptNum, model.Ipv4Names[i], model.Ipv4s[i], err)) + } + // 如果原始IP失败，尝试备选IP + if tryAltIPs := tryAlternativeIPs(model.Ipv4Names[i], "v4"); len(tryAltIPs) > 0 { + for _, altIP := range tryAltIPs { + if model.EnableLoger { + Logger.Info(fmt.Sprintf("第%d次尝试备选IP %s 追踪 %s", attemptNum, altIP, model.Ipv4Names[i])) + } + hops, err = Trace(net.ParseIP(altIP)) + if err == nil && len(hops) > 0 { + break // 成功找到可用IP + } } } } - } - if err == nil && len(hops) > 0 { - allHops = append(allHops, hops) - successfulTraces++ - if model.EnableLoger { - Logger.Info(fmt.Sprintf("第%d次追踪 %s (%s) 成功，获得%d个hop", attempt, model.Ipv4Names[i], model.Ipv4s[i], len(hops))) + if err == nil && len(hops) > 0 { + mu.Lock() + allHops = append(allHops, hops) + successfulTraces++ + mu.Unlock() + if model.EnableLoger { + Logger.Info(fmt.Sprintf("第%d次追踪 %s (%s) 成功，获得%d个hop", attemptNum, model.Ipv4Names[i], model.Ipv4s[i], len(hops))) + } } - } + }(attempt) } + // 等待所有goroutine完成 + wg.Wait() // 如果3次都失败 if successfulTraces == 0 { s := fmt.Sprintf("%v %-15s %v", model.Ipv4Names[i], model.Ipv4s[i], Red("检测不到回程路由节点的IP地址")) diff --git a/bk/trace_ipv6.go b/bk/trace_ipv6.go index 682f034..ae1b938 100644 --- a/bk/trace_ipv6.go +++ b/bk/trace_ipv6.go @@ -4,6 +4,7 @@ import ( "fmt" "net" "strings" + "sync" "github.com/oneclickvirt/backtrace/model" . "github.com/oneclickvirt/defaultset" @@ -79,38 +80,48 @@ func traceIPv6(ch chan Result, i int, offset int) { } var allHops [][]*Hop var successfulTraces int - // 尝试3次trace + var mu sync.Mutex + var wg sync.WaitGroup + // 并发执行3次trace for attempt := 1; attempt <= 3; attempt++ { - if model.EnableLoger { - Logger.Info(fmt.Sprintf("第%d次尝试追踪 %s (%s)", attempt, model.Ipv6Names[i], model.Ipv6s[i])) - } - // 先尝试原始IP地址 - hops, err := Trace(net.ParseIP(model.Ipv6s[i])) - if err != nil { + wg.Add(1) + go func(attemptNum int) { + defer wg.Done() if model.EnableLoger { - Logger.Warn(fmt.Sprintf("第%d次追踪 %s (%s) 失败: %v", attempt, model.Ipv6Names[i], model.Ipv6s[i], err)) + Logger.Info(fmt.Sprintf("第%d次尝试追踪 %s (%s)", attemptNum, model.Ipv6Names[i], model.Ipv6s[i])) } - // 如果原始IP失败，尝试备选IP - if tryAltIPs := tryAlternativeIPs(model.Ipv6Names[i], "v6"); len(tryAltIPs) > 0 { - for _, altIP := range tryAltIPs { - if model.EnableLoger { - Logger.Info(fmt.Sprintf("第%d次尝试备选IP %s 追踪 %s", attempt, altIP, model.Ipv6Names[i])) - } - hops, err = Trace(net.ParseIP(altIP)) - if err == nil && len(hops) > 0 { - break // 成功找到可用IP + // 先尝试原始IP地址 + hops, err := Trace(net.ParseIP(model.Ipv6s[i])) + if err != nil { + if model.EnableLoger { + Logger.Warn(fmt.Sprintf("第%d次追踪 %s (%s) 失败: %v", attemptNum, model.Ipv6Names[i], model.Ipv6s[i], err)) + } + // 如果原始IP失败，尝试备选IP + if tryAltIPs := tryAlternativeIPs(model.Ipv6Names[i], "v6"); len(tryAltIPs) > 0 { + for _, altIP := range tryAltIPs { + if model.EnableLoger { + Logger.Info(fmt.Sprintf("第%d次尝试备选IP %s 追踪 %s", attemptNum, altIP, model.Ipv6Names[i])) + } + hops, err = Trace(net.ParseIP(altIP)) + if err == nil && len(hops) > 0 { + break // 成功找到可用IP + } } } } - } - if err == nil && len(hops) > 0 { - allHops = append(allHops, hops) - successfulTraces++ - if model.EnableLoger { - Logger.Info(fmt.Sprintf("第%d次追踪 %s (%s) 成功，获得%d个hop", attempt, model.Ipv6Names[i], model.Ipv6s[i], len(hops))) + if err == nil && len(hops) > 0 { + mu.Lock() + allHops = append(allHops, hops) + successfulTraces++ + mu.Unlock() + if model.EnableLoger { + Logger.Info(fmt.Sprintf("第%d次追踪 %s (%s) 成功，获得%d个hop", attemptNum, model.Ipv6Names[i], model.Ipv6s[i], len(hops))) + } } - } + }(attempt) } + // 等待所有goroutine完成 + wg.Wait() // 如果3次都失败 if successfulTraces == 0 { s := fmt.Sprintf("%v %-24s %v", model.Ipv6Names[i], model.Ipv6s[i], Red("检测不到回程路由节点的IP地址"))