status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-03 01:14:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix ipv6 join failure

Browse Source
This commit is contained in:
Wim 2017-04-06 22:53:10 +02:00
parent f13fc99852
commit d38ceaa3ea
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
consul/servers/serf_flooder.go
View File

@ -69,6 +69,17 @@ func FloodJoins(logger *log.Logger, portFn FloodPortFn,
// leave it blank to behave as if we just supplied an address. // leave it blank to behave as if we just supplied an address.
if port, ok := portFn(server); ok { if port, ok := portFn(server); ok {
addr = net.JoinHostPort(addr, fmt.Sprintf("%d", port)) addr = net.JoinHostPort(addr, fmt.Sprintf("%d", port))
} else {
// globalSerf.Join expects bracketed ipv6 addresses
ip := net.ParseIP(addr)
if ip == nil {
// should never happen
logger.Printf("[DEBUG] consul: Failed to parse IP %s", addr)
}
// If we have an IPv6 address, we should add brackets
if ip.To4() == nil {
addr = fmt.Sprintf("[%s]", addr)
}
} }
// Do the join! // Do the join!