Skip to content
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

Jump to bottom

Consider network settings to avoid creating unexpected JmDNS instances #3978

Merged
merged 1 commit into from
Dec 30, 2023
Merged

Consider network settings to avoid creating unexpected JmDNS instances #3978

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 18 additions & 14 deletions ...nsport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,18 +282,19 @@ private void createJmDNSByAddress(InetAddress address) {
public void onChanged(List<CidrAddress> added, List<CidrAddress> removed) {
logger.debug("ip address change: added {}, removed {}", added, removed);

Set<InetAddress> filteredAddresses = getAllInetAddresses();

// First check if there is really a jmdns instance to remove or add
boolean changeRequired = false;
for (CidrAddress address : removed) {
JmDNS jmdns = jmdnsInstances.get(address.getAddress());
if (jmdns != null) {
for (InetAddress address : jmdnsInstances.keySet()) {
if (!filteredAddresses.contains(address)) {
changeRequired = true;
break;
}
}
if (!changeRequired) {
for (CidrAddress address : added) {
JmDNS jmdns = jmdnsInstances.get(address.getAddress());
for (InetAddress address : filteredAddresses) {
JmDNS jmdns = jmdnsInstances.get(address);
if (jmdns == null) {
changeRequired = true;
break;
Expand All @@ -308,20 +309,23 @@ public void onChanged(List<CidrAddress> added, List<CidrAddress> removed) {
for (ServiceDescription description : activeServices) {
unregisterServiceInternal(description);
}
for (CidrAddress address : removed) {
JmDNS jmdns = jmdnsInstances.remove(address.getAddress());
if (jmdns != null) {
closeQuietly(jmdns);
logger.debug("mDNS service has been stopped ({})", jmdns.getName());
for (InetAddress address : jmdnsInstances.keySet()) {
if (!filteredAddresses.contains(address)) {
JmDNS jmdns = jmdnsInstances.remove(address);
if (jmdns != null) {
closeQuietly(jmdns);
logger.debug("mDNS service has been stopped ({} for IP {})", jmdns.getName(),
address.getHostAddress());
}
}
}
for (CidrAddress address : added) {
JmDNS jmdns = jmdnsInstances.get(address.getAddress());
for (InetAddress address : filteredAddresses) {
JmDNS jmdns = jmdnsInstances.get(address);
if (jmdns == null) {
createJmDNSByAddress(address.getAddress());
createJmDNSByAddress(address);
} else {
logger.debug("mDNS service was already started ({} for IP {})", jmdns.getName(),
address.getAddress().getHostAddress());
address.getHostAddress());
}
}
for (ServiceDescription description : activeServices) {
Expand Down