Skip to content

Fix network interface configuration option enumeration #5006

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
holgerfriedrich merged 2 commits into from
Sep 7, 2025
Merged

Fix network interface configuration option enumeration #5006

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76eeed3
Fix network interface configuration option enumeration
Sep 4, 2025
d77079e
Update bundles/org.openhab.core.config.core/src/main/java/org/openhab…
Nadahar Sep 7, 2025
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
33 changes: 19 additions & 14 deletions .../src/main/java/org/openhab/core/config/core/internal/net/NetworkConfigOptionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.stream.Stream;

import org.eclipse.jdt.annotation.NonNullByDefault;
Expand All @@ -30,6 +31,7 @@
import org.openhab.core.config.core.ParameterOption;
import org.openhab.core.net.CidrAddress;
import org.openhab.core.net.NetUtil;
import org.openhab.core.util.StringUtils;
import org.osgi.service.component.annotations.Component;

/**
Expand Down Expand Up @@ -67,8 +69,10 @@ public class NetworkConfigOptionProvider implements ConfigOptionProvider {
Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
while (networkInterfaces.hasMoreElements()) {
NetworkInterface networkInterface = networkInterfaces.nextElement();
options.add(new ParameterOption(networkInterface.getName(),
getNetworkInterfaceLabel(networkInterface)));
if (networkInterface.isUp()) {
options.add(new ParameterOption(networkInterface.getName(),
getNetworkInterfaceLabel(networkInterface)));
}
}
return options;
} catch (SocketException e) {
Expand All @@ -80,18 +84,19 @@ public class NetworkConfigOptionProvider implements ConfigOptionProvider {
}

private String getNetworkInterfaceLabel(NetworkInterface networkInterface) {
Enumeration<InetAddress> inetAddresses = networkInterface.getInetAddresses();
String hostName = null;
while (inetAddresses.hasMoreElements()) {
InetAddress inetAddress = inetAddresses.nextElement();
if (inetAddress instanceof Inet4Address) {
hostName = inetAddress.getHostName();
break;
} else if (hostName == null) {
hostName = inetAddress.getHostName();
}
StringBuilder result = new StringBuilder(Objects
.requireNonNull(StringUtils.capitalizeByWhitespace(networkInterface.getName().replace('_', ' '))));

// Sort IPv4 before IPv6
List<InetAddress> addresses = networkInterface.inetAddresses().sorted((ia1, ia2) -> {
return (ia1 instanceof Inet4Address) == (ia2 instanceof Inet4Address) ? 0
: ia1 instanceof Inet4Address ? -1 : 1;
}).toList();

if (!addresses.isEmpty()) {
result.append(" (").append(addresses.get(0).getHostAddress()).append(')');
Comment thread
Nadahar marked this conversation as resolved.
Outdated
}
return hostName == null ? networkInterface.getName()
: String.format("%s (%s)", networkInterface.getName(), hostName);

return result.toString();
}
}