Merge pull request #258 from nxtrace/main

SYNC
nxtrace · Sep 10, 2024 · 6a3ea6a · 6a3ea6a
2 parents b507dea + 42e4a23
commit 6a3ea6a
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 13 deletions.
diff --git a/fast_trace/basic.go b/fast_trace/basic.go
@@ -54,6 +54,11 @@ var Beijing = BackBoneCollection{
  IPv6: "ipv6.pek-4134.endpoint.nxtrace.org.",
  },
 
+ CTCN2: ISPCollection{
+ ISPName: CTCN2,
+ IP: "ipv4.pek-4809.endpoint.nxtrace.org.",
+ },
+
  CU169: ISPCollection{
  ISPName: CU169,
  IP: "ipv4.pek-4837.endpoint.nxtrace.org.",
@@ -141,18 +146,33 @@ var Guangzhou = BackBoneCollection{
  IPv6: "ipv6.can-4134.endpoint.nxtrace.org.",
  },
 
+ CTCN2: ISPCollection{
+ ISPName: CTCN2,
+ IP: "ipv4.can-4809.endpoint.nxtrace.org.",
+ },
+
  CU169: ISPCollection{
  ISPName: CU169,
  IP: "ipv4.can-4837.endpoint.nxtrace.org.",
  IPv6: "ipv6.can-4837.endpoint.nxtrace.org.",
  },
 
+ CU9929: ISPCollection{
+ ISPName: CU9929,
+ IP: "ipv4.can-9929.endpoint.nxtrace.org.",
+ },
+
  CM: ISPCollection{
  ISPName: CM,
  IP: "ipv4.can-9808.endpoint.nxtrace.org.",
  IPv6: "ipv6.can-9808.endpoint.nxtrace.org.",
  },
 
+ CMIN2: ISPCollection{
+ ISPName: CMIN2,
+ IP: "ipv4.can-58807.endpoint.nxtrace.org.",
+ },
+
  // 中山大学
  EDU: ISPCollection{
  ISPName: EDU,

diff --git a/fast_trace/fast_trace.go b/fast_trace/fast_trace.go
@@ -35,7 +35,7 @@ type ParamsFastTrace struct {
  Timeout time.Duration
  File string
  DontFragment bool
- Dot  string
+ Dot  string
 }
 
 type IpListElement struct {
@@ -385,28 +385,33 @@ func (f *FastTracer) testAll() {
 
 func (f *FastTracer) testCT() {
  f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CT163)
+ f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CTCN2)
  f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CT163)
  f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CTCN2)
- f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CT163)
  f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CT163)
+ f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CTCN2)
+ f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CT163)
 }
 
 func (f *FastTracer) testCU() {
  f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU169)
  f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU9929)
  f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CU169)
  f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CU9929)
- f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CU169)
  f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CU169)
+ f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CU9929)
+ f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CU169)
+
 }
 
 func (f *FastTracer) testCM() {
  f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CM)
  f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CMIN2)
  f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CM)
  f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CMIN2)
- f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CM)
  f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CM)
+ f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CMIN2)
+ f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CM)
 }
 
 func (f *FastTracer) testEDU() {

diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
  github.com/stretchr/testify v1.9.0
  github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
  github.com/tsosunchia/powclient v0.1.5
- golang.org/x/net v0.28.0
+ golang.org/x/net v0.29.0
  golang.org/x/sync v0.8.0
 )
 
@@ -33,7 +33,7 @@ require (
  github.com/subosito/gotenv v1.6.0 // indirect
  go.uber.org/multierr v1.11.0 // indirect
  golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
- golang.org/x/text v0.17.0 // indirect
+ golang.org/x/text v0.18.0 // indirect
  gopkg.in/ini.v1 v1.67.0 // indirect
 )
 
@@ -45,6 +45,6 @@ require (
  github.com/tidwall/gjson v1.17.3
  github.com/tidwall/match v1.1.1 // indirect
  github.com/tidwall/pretty v1.2.1 // indirect
- golang.org/x/sys v0.24.0 // indirect
+ golang.org/x/sys v0.25.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -94,20 +94,20 @@ golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPI
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=