diff --git a/goecs.go b/goecs.go index 7aa4de1..4053949 100644 --- a/goecs.go +++ b/goecs.go @@ -62,7 +62,6 @@ var ( onlyIpInfoCheckStatus, help bool goecsFlag = flag.NewFlagSet("goecs", flag.ContinueOnError) finish bool - IPV4, IPV6 string ) func getMenuChoice(language string) string { @@ -587,7 +586,8 @@ func runIpInfoCheck(output, tempOutput string, outputMutex *sync.Mutex) string { outputMutex.Lock() defer outputMutex.Unlock() return utils.PrintAndCapture(func() { - _, _, ipinfo := utils.OnlyBasicsIpInfo(language) + var ipinfo string + upstreams.IPV4, upstreams.IPV6, ipinfo = utils.OnlyBasicsIpInfo(language) if ipinfo != "" { if language == "zh" { utils.PrintCenteredTitle("IP信息", width) @@ -613,13 +613,13 @@ func runBasicTests(preCheck utils.NetCheckResult, basicInfo, securityInfo *strin } } if preCheck.Connected && preCheck.StackType == "DualStack" { - IPV4, IPV6, *basicInfo, *securityInfo, nt3CheckType = utils.BasicsAndSecurityCheck(language, nt3CheckType, securityTestStatus) + upstreams.IPV4, upstreams.IPV6, *basicInfo, *securityInfo, nt3CheckType = utils.BasicsAndSecurityCheck(language, nt3CheckType, securityTestStatus) } else if preCheck.Connected && preCheck.StackType == "IPv4" { - IPV4, IPV6, *basicInfo, *securityInfo, nt3CheckType = utils.BasicsAndSecurityCheck(language, "ipv4", securityTestStatus) + upstreams.IPV4, upstreams.IPV6, *basicInfo, *securityInfo, nt3CheckType = utils.BasicsAndSecurityCheck(language, "ipv4", securityTestStatus) } else if preCheck.Connected && preCheck.StackType == "IPv6" { - IPV4, IPV6, *basicInfo, *securityInfo, nt3CheckType = utils.BasicsAndSecurityCheck(language, "ipv6", securityTestStatus) + upstreams.IPV4, upstreams.IPV6, *basicInfo, *securityInfo, nt3CheckType = utils.BasicsAndSecurityCheck(language, "ipv6", securityTestStatus) } else { - IPV4, IPV6, *basicInfo, *securityInfo, nt3CheckType = utils.BasicsAndSecurityCheck(language, "", false) + upstreams.IPV4, upstreams.IPV6, *basicInfo, *securityInfo, nt3CheckType = utils.BasicsAndSecurityCheck(language, "", false) securityTestStatus = false } if basicStatus { @@ -760,7 +760,7 @@ func runNetworkTests(wg3 *sync.WaitGroup, ptInfo *string, output, tempOutput str output = utils.PrintAndCapture(func() { if backtraceStatus && !onlyChinaTest { utils.PrintCenteredTitle("上游及回程线路检测", width) - upstreams.UpstreamsCheck(IPV4) + upstreams.UpstreamsCheck() } }, tempOutput, output) output = utils.PrintAndCapture(func() { diff --git a/upstreams/upstreams.go b/upstreams/upstreams.go index c3bff2e..591794b 100644 --- a/upstreams/upstreams.go +++ b/upstreams/upstreams.go @@ -8,11 +8,13 @@ import ( backtrace "github.com/oneclickvirt/backtrace/bk" ) -func UpstreamsCheck(ip string) { - if ip != "" { - if result, err := bgptools.GetPoPInfo(ip); err == nil { +var IPV4, IPV6 string + +func UpstreamsCheck() { + if IPV4 != "" { + if result, err := bgptools.GetPoPInfo(IPV4); err == nil { fmt.Print(result.Result) } } backtrace.BackTrace(uts.IPV6) -} +} \ No newline at end of file diff --git a/upstreams/uptreams_test.go b/upstreams/uptreams_test.go index 0545b59..ed49b71 100644 --- a/upstreams/uptreams_test.go +++ b/upstreams/uptreams_test.go @@ -3,5 +3,6 @@ package upstreams import "testing" func TestUpstreamsCheck(t *testing.T) { - UpstreamsCheck("148.100.85.25") + IPV4 = "148.100.85.25" + UpstreamsCheck() }