Merge pull request #255 from nxtrace/main

SYNC
nxtrace · Sep 1, 2024 · e072b0d · e072b0d
2 parents f13889f + 868bf3d
commit e072b0d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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 {
@@ -411,13 +411,17 @@ 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)
 }
 
 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)
 }