Skip to content

Commit 6a3ea6a

Browse files
tsosunchiatsosunchia
authored
Merge pull request #258 from nxtrace/main
SYNC
2 parents b507dea + 42e4a23 commit 6a3ea6a

4 files changed

Lines changed: 38 additions & 13 deletions

File tree

‎fast_trace/basic.go‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ var Beijing = BackBoneCollection{
5454
IPv6: "ipv6.pek-4134.endpoint.nxtrace.org.",
5555
},
5656

57+
CTCN2: ISPCollection{
58+
ISPName: CTCN2,
59+
IP: "ipv4.pek-4809.endpoint.nxtrace.org.",
60+
},
61+
5762
CU169: ISPCollection{
5863
ISPName: CU169,
5964
IP: "ipv4.pek-4837.endpoint.nxtrace.org.",
@@ -141,18 +146,33 @@ var Guangzhou = BackBoneCollection{
141146
IPv6: "ipv6.can-4134.endpoint.nxtrace.org.",
142147
},
143148

149+
CTCN2: ISPCollection{
150+
ISPName: CTCN2,
151+
IP: "ipv4.can-4809.endpoint.nxtrace.org.",
152+
},
153+
144154
CU169: ISPCollection{
145155
ISPName: CU169,
146156
IP: "ipv4.can-4837.endpoint.nxtrace.org.",
147157
IPv6: "ipv6.can-4837.endpoint.nxtrace.org.",
148158
},
149159

160+
CU9929: ISPCollection{
161+
ISPName: CU9929,
162+
IP: "ipv4.can-9929.endpoint.nxtrace.org.",
163+
},
164+
150165
CM: ISPCollection{
151166
ISPName: CM,
152167
IP: "ipv4.can-9808.endpoint.nxtrace.org.",
153168
IPv6: "ipv6.can-9808.endpoint.nxtrace.org.",
154169
},
155170

171+
CMIN2: ISPCollection{
172+
ISPName: CMIN2,
173+
IP: "ipv4.can-58807.endpoint.nxtrace.org.",
174+
},
175+
156176
// 中山大学
157177
EDU: ISPCollection{
158178
ISPName: EDU,

‎fast_trace/fast_trace.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ type ParamsFastTrace struct {
3535
Timeout time.Duration
3636
File string
3737
DontFragment bool
38-
Dot string
38+
Dot string
3939
}
4040

4141
type IpListElement struct {
@@ -385,28 +385,33 @@ func (f *FastTracer) testAll() {
385385

386386
func (f *FastTracer) testCT() {
387387
f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CT163)
388+
f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CTCN2)
388389
f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CT163)
389390
f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CTCN2)
390-
f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CT163)
391391
f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CT163)
392+
f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CTCN2)
393+
f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CT163)
392394
}
393395

394396
func (f *FastTracer) testCU() {
395397
f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU169)
396398
f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU9929)
397399
f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CU169)
398400
f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CU9929)
399-
f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CU169)
400401
f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CU169)
402+
f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CU9929)
403+
f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CU169)
404+
401405
}
402406

403407
func (f *FastTracer) testCM() {
404408
f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CM)
405409
f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CMIN2)
406410
f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CM)
407411
f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CMIN2)
408-
f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CM)
409412
f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CM)
413+
f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CMIN2)
414+
f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CM)
410415
}
411416

412417
func (f *FastTracer) testEDU() {

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/stretchr/testify v1.9.0
1111
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
1212
github.com/tsosunchia/powclient v0.1.5
13-
golang.org/x/net v0.28.0
13+
golang.org/x/net v0.29.0
1414
golang.org/x/sync v0.8.0
1515
)
1616

@@ -33,7 +33,7 @@ require (
3333
github.com/subosito/gotenv v1.6.0 // indirect
3434
go.uber.org/multierr v1.11.0 // indirect
3535
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
36-
golang.org/x/text v0.17.0 // indirect
36+
golang.org/x/text v0.18.0 // indirect
3737
gopkg.in/ini.v1 v1.67.0 // indirect
3838
)
3939

@@ -45,6 +45,6 @@ require (
4545
github.com/tidwall/gjson v1.17.3
4646
github.com/tidwall/match v1.1.1 // indirect
4747
github.com/tidwall/pretty v1.2.1 // indirect
48-
golang.org/x/sys v0.24.0 // indirect
48+
golang.org/x/sys v0.25.0 // indirect
4949
gopkg.in/yaml.v3 v3.0.1 // indirect
5050
)

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,20 +94,20 @@ golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPI
9494
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
9595
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
9696
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
97-
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
98-
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
97+
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
98+
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
9999
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
100100
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
101101
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
102102
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
103103
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
104104
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
105105
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
106-
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
107-
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
106+
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
107+
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
108108
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
109-
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
110-
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
109+
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
110+
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
111111
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
112112
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
113113
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

0 commit comments

Comments
 (0)