diff options
| author | Michael Klishin <michael@novemberain.com> | 2017-04-25 13:09:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 13:09:06 +0200 |
| commit | b03a14fc1649d2d79ec01c55d39884dce7c2d748 (patch) | |
| tree | 3baad871ba470b1ca32224564453c41d9b4018df /src | |
| parent | 261efd9458afb7c1f2eb6c23405415afd4e73740 (diff) | |
| parent | 0bb59f8df0a5c8dffa2677db3fb46c719c85eb6a (diff) | |
| download | rabbitmq-server-git-b03a14fc1649d2d79ec01c55d39884dce7c2d748.tar.gz | |
Merge pull request #1189 from rabbitmq/rabbitmq-server-1171
Add IPv6 support for DNS discovery
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_peer_discovery_dns.erl | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/rabbit_peer_discovery_dns.erl b/src/rabbit_peer_discovery_dns.erl index 5bc85d340d..f048a40c89 100644 --- a/src/rabbit_peer_discovery_dns.erl +++ b/src/rabbit_peer_discovery_dns.erl @@ -75,14 +75,25 @@ discover_nodes(SeedHostname, LongNamesUsed) -> H <- discover_hostnames(SeedHostname, LongNamesUsed)]. discover_hostnames(SeedHostname, LongNamesUsed) -> - %% TODO: IPv6 support - IPs = inet_res:lookup(SeedHostname, in, a), - rabbit_log:info("Addresses discovered via A records of ~s: ~s", - [SeedHostname, string:join([inet_parse:ntoa(IP) || IP <- IPs], ", ")]), + lookup(SeedHostname, LongNamesUsed, ipv4) ++ + lookup(SeedHostname, LongNamesUsed, ipv6). + +decode_record(ipv4) -> + a; +decode_record(ipv6) -> + aaaa. + +lookup(SeedHostname, LongNamesUsed, IPv) -> + IPs = inet_res:lookup(SeedHostname, in, decode_record(IPv)), + rabbit_log:info("Addresses discovered via ~s records of ~s: ~s", + [string:to_upper(atom_to_list(decode_record(IPv))), + SeedHostname, + string:join([inet_parse:ntoa(IP) || IP <- IPs], ", ")]), Hosts = [extract_host(inet:gethostbyaddr(A), LongNamesUsed, A) || - A <- IPs], + A <- IPs], lists:filter(fun(E) -> E =/= error end, Hosts). + %% long node names are used extract_host({ok, {hostent, FQDN, _, _, _, _}}, true, _Address) -> FQDN; |