From 79ac0bc456a29dd750e79053999f7428c16a2698 Mon Sep 17 00:00:00 2001 From: tsosunchia <59512455+tsosunchia@users.noreply.github.com> Date: Sun, 1 Sep 2024 15:24:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?FT=E5=A2=9E=E5=8A=A0=E5=8C=97=E4=BA=ACCST?= =?UTF-8?q?=E5=92=8C=E5=B9=BF=E5=B7=9EEDU?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fast_trace/basic.go | 21 ++++++++++++++++++--- fast_trace/fast_trace ipv6.go | 7 ++++++- fast_trace/fast_trace.go | 6 +++++- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/fast_trace/basic.go b/fast_trace/basic.go index 7801be09..d51720cf 100644 --- a/fast_trace/basic.go +++ b/fast_trace/basic.go @@ -31,10 +31,11 @@ const ( CT163 string = "电信 163 AS4134" CTCN2 string = "电信 CN2 AS4809" CU169 string = "联通 169 AS4837" - CU9929 string = "联通 A网 AS9929" - CM string = "移动 骨干网 AS9808" + CU9929 string = "联通 A网(CNC) AS9929" + CM string = "移动 CMNET AS9808" CMIN2 string = "移动 CMIN2 AS58807" EDU string = "教育网 CERNET AS4538" + CST string = "科技网 CSTNET AS7497" ) var TestIPsCollection = AllLocationCollection{ @@ -80,6 +81,13 @@ var Beijing = BackBoneCollection{ IP: "ipv4.pek-4538.endpoint.nxtrace.org.", IPv6: "ipv6.pek-4538.endpoint.nxtrace.org.", }, + + // 中科院 + CST: ISPCollection{ + ISPName: CST, + IP: "ipv4.pek-7497.endpoint.nxtrace.org.", + IPv6: "ipv6.pek-7497.endpoint.nxtrace.org.", + }, } var Shanghai = BackBoneCollection{ @@ -144,6 +152,13 @@ var Guangzhou = BackBoneCollection{ IP: "ipv4.can-9808.endpoint.nxtrace.org.", IPv6: "ipv6.can-9808.endpoint.nxtrace.org.", }, + + // 中山大学 + EDU: ISPCollection{ + ISPName: EDU, + IP: "ipv4.can-4538.endpoint.nxtrace.org.", + IPv6: "ipv6.can-4538.endpoint.nxtrace.org.", + }, } var Hangzhou = BackBoneCollection{ @@ -180,7 +195,7 @@ var Hefei = BackBoneCollection{ }, // 中国科学技术大学 科技网 CST: ISPCollection{ - ISPName: "中国科学技术大学 科技网 AS7497", + ISPName: CST, IP: "ipv4.hfe-7497.endpoint.nxtrace.org.", }, } diff --git a/fast_trace/fast_trace ipv6.go b/fast_trace/fast_trace ipv6.go index 2aa71015..dc633b30 100644 --- a/fast_trace/fast_trace ipv6.go +++ b/fast_trace/fast_trace ipv6.go @@ -107,13 +107,18 @@ func (f *FastTracer) testEDU_v6() { f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU) f.tracert_v6(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.EDU) f.tracert_v6(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.EDU) + f.tracert_v6(TestIPsCollection.Hefei.Location, TestIPsCollection.Hefei.EDU) + f.tracert_v6(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.EDU) + // 科技网暂时算在EDU里面，等拿到了足够多的数据再分离出去，单独用于测试 + f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CST) } func (f *FastTracer) testFast_v6() { f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CT163) f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU169) f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CM) - f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU) + //f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU) + //f.tracert_v6(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CST) } func FastTestv6(tm bool, outEnable bool, paramsFastTrace ParamsFastTrace) { diff --git a/fast_trace/fast_trace.go b/fast_trace/fast_trace.go index 5c291b54..27c9d7b4 100644 --- a/fast_trace/fast_trace.go +++ b/fast_trace/fast_trace.go @@ -411,7 +411,10 @@ func (f *FastTracer) testEDU() { f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU) f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.EDU) f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.EDU) + f.tracert(TestIPsCollection.Hefei.Location, TestIPsCollection.Hefei.EDU) + f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.EDU) // 科技网暂时算在EDU里面，等拿到了足够多的数据再分离出去，单独用于测试 + f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CST) f.tracert(TestIPsCollection.Hefei.Location, TestIPsCollection.Hefei.CST) } @@ -419,5 +422,6 @@ func (f *FastTracer) testFast() { f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CT163) f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU169) f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CM) - f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU) + //f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU) + //f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CST) } From 868bf3d6910de3c37bacfe84ce4982f2f8497949 Mon Sep 17 00:00:00 2001 From: tsosunchia <59512455+tsosunchia@users.noreply.github.com> Date: Sun, 1 Sep 2024 15:37:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?FT=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fast_trace/fast_trace.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fast_trace/fast_trace.go b/fast_trace/fast_trace.go index 27c9d7b4..778b51c5 100644 --- a/fast_trace/fast_trace.go +++ b/fast_trace/fast_trace.go @@ -159,7 +159,7 @@ func FastTest(tm bool, outEnable bool, paramsFastTrace ParamsFastTrace) { } } - fmt.Println("您想测试哪些ISP的路由？\n1. 国内四网\n2. 电信\n3. 联通\n4. 移动\n5. 教育网\n6. 全部") + fmt.Println("您想测试哪些ISP的路由？\n1. 北京三网快速测试\n2. 全国电信\n3. 全国联通\n4. 全国移动\n5. 全国教育网\n6. 全国五网") fmt.Print("请选择选项：") _, err = fmt.Scanln(&c) if err != nil {