cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Handle both IPv4 and IPv6

Browse Source 
use net.JoinHostPort(minerIP, minerPort) to handle both IPv4 and IPv6 addresses.
This commit is contained in:
Phi 2023-09-25 13:56:35 +02:00
parent 3f2d2eb659
commit f1c70720df
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/lotus-worker/main.go
View File

@ -806,13 +806,8 @@ func extractRoutableIP(timeout time.Duration) (string, error) {
} }
minerPort, _ := maddr.ValueForProtocol(multiaddr.P_TCP) minerPort, _ := maddr.ValueForProtocol(multiaddr.P_TCP)
// Check if the IP is IPv6 and format the address appropriately // Format the address appropriately
var addressToDial string addressToDial := net.JoinHostPort(minerIP, minerPort)
if ip := net.ParseIP(minerIP); ip.To4() == nil && ip.To16() != nil {
addressToDial = "[" + minerIP + "]:" + minerPort
} else {
addressToDial = minerIP + ":" + minerPort
}
conn, err := net.DialTimeout("tcp", addressToDial, timeout) conn, err := net.DialTimeout("tcp", addressToDial, timeout)
if err != nil { if err != nil {