Skip to content

RATIS-2131: Surround with [] only if hostName is a IPv6 string #1125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szetszwo merged 1 commit into from
Jul 25, 2024
Merged

RATIS-2131: Surround with [] only if hostName is a IPv6 string #1125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ratis-common/src/main/java/org/apache/ratis/util/NetUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
*/
package org.apache.ratis.util;

import org.apache.ratis.thirdparty.com.google.common.net.InetAddresses;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -145,8 +147,12 @@ static String address2String(InetSocketAddress address) {
if (address == null) {
return null;
}
final StringBuilder b = new StringBuilder(address.getHostName());
if (address.getAddress() instanceof Inet6Address) {
String hostName = address.getHostName();
final StringBuilder b = new StringBuilder(hostName);
// Surround with '[', ']' only if it is a IPv6 ip - not for a IPv6 host
if (address.getAddress() instanceof Inet6Address &&
InetAddresses.isInetAddress(hostName) &&
InetAddresses.forString(hostName).getAddress().length == 16) {
b.insert(0, '[').append(']');
}
return b.append(':').append(address.getPort()).toString();
Expand Down