status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: ping dns4 multiaddresses (#2678)

This commit is contained in:
Richard Ramos 2022-05-19 10:23:25 -04:00 committed by GitHub
parent 011238b1d1
commit 3e2ce20f0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 72 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
services/mailservers/fleet.go
View File

@ -131,5 +131,60 @@ func DefaultMailservers() []Mailserver {
Fleet: params.FleetWakuV2Test,
Version: 2,
},
Mailserver{
ID: "node-01.ac-cn-hongkong-c.status.prod",
Address: "/dns4/node-01.ac-cn-hongkong-c.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAkvEZgh3KLwhLwXg95e5ojM8XykJ4Kxi2T7hk22rnA7pJC",
Fleet: params.FleetStatusProd,
Version: 2,
},
Mailserver{
ID: "node-01.do-ams3.status.prod",
Address: "/dns4/node-01.do-ams3.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAm6HZZr7aToTvEBPpiys4UxajCTU97zj5v7RNR2gbniy1D",
Fleet: params.FleetStatusProd,
Version: 2,
},
Mailserver{
ID: "node-01.gc-us-central1-a.status.prod",
Address: "/dns4/node-01.gc-us-central1-a.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAkwBp8T6G77kQXSNMnxgaMky1JeyML5yqoTHRM8dbeCBNb",
Fleet: params.FleetStatusProd,
Version: 2,
},
Mailserver{
ID: "node-02.ac-cn-hongkong-c.status.prod",
Address: "/dns4/node-02.ac-cn-hongkong-c.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmFy8BrJhCEmCYrUfBdSNkrPw6VHExtv4rRp1DSBnCPgx8",
Fleet: params.FleetStatusProd,
Version: 2,
},
Mailserver{
ID: "node-02.do-ams3.status.prod",
Address: "/dns4/node-02.do-ams3.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmSve7tR5YZugpskMv2dmJAsMUKmfWYEKRXNUxRaTCnsXV",
Fleet: params.FleetStatusProd,
Version: 2,
},
Mailserver{
ID: "node-02.gc-us-central1-a.status.prod",
Address: "/dns4/node-02.gc-us-central1-a.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmDQugwDHM3YeUp86iGjrUvbdw3JPRgikC7YoGBsT2ymMg",
Fleet: params.FleetStatusProd,
Version: 2,
},
Mailserver{
ID: "node-01.ac-cn-hongkong-c.status.test",
Address: "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi",
Fleet: params.FleetStatusTest,
Version: 2,
},
Mailserver{
ID: "node-01.do-ams3.status.test",
Address: "/dns4/node-01.do-ams3.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf",
Fleet: params.FleetStatusTest,
Version: 2,
},
Mailserver{
ID: "node-01.gc-us-central1-a.status.test",
Address: "/dns4/node-01.gc-us-central1-a.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAmGDX3iAFox93PupVYaHa88kULGqMpJ7AEHGwj3jbMtt76",
Fleet: params.FleetStatusTest,
Version: 2,
},
}
}

19
services/mailservers/tcp_ping.go
View File

@ -120,11 +120,26 @@ func MultiAddressToAddress(multiAddr string) (string, error) {
return "", err
}
ip4, err := ma.ValueForProtocol(multiaddr.P_IP4)
if err != nil {
dns4, err := ma.ValueForProtocol(multiaddr.P_DNS4)
if err != nil && err != multiaddr.ErrProtocolNotFound {
return "", err
}
ip4 := ""
if dns4 != "" {
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
ip4, err = net.DefaultResolver.LookupCNAME(ctx, dns4)
if err != nil {
return "", err
}
} else {
ip4, err = ma.ValueForProtocol(multiaddr.P_IP4)
if err != nil {
return "", err
}
}
tcp, err := ma.ValueForProtocol(multiaddr.P_TCP)
if err != nil {
return "", err