status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-18 00:27:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2895 from hashicorp/pr/2878

Browse Source 
Adds brackets around ipv6 addresses for flood joins.
This commit is contained in:
James Phillips 2017-04-12 10:04:39 -07:00 committed by GitHub
commit 05fe2d62e2
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
consul/servers/serf_flooder.go
View File

@ -69,6 +69,16 @@ 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 {
// If we have an IPv6 address, we should add brackets,
// single globalSerf.Join expects that.
if ip := net.ParseIP(addr); ip != nil {
if ip.To4() == nil {
addr = fmt.Sprintf("[%s]", addr)
}
} else {
logger.Printf("[DEBUG] consul: Failed to parse IP %s", addr)
}
} }
// Do the join! // Do the join!