demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 21:31:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Consider network settings to avoid creating unexpected JmDNS instances (#3978)

Browse Source 
Fix #3976

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo 2023-12-30 12:50:27 +01:00 committed by GitHub
parent f376606e92
commit 63ae134c33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSClientImpl.java
View File

@ -282,18 +282,19 @@ public class MDNSClientImpl implements MDNSClient, NetworkAddressChangeListener
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;
@ -308,20 +309,23 @@ public class MDNSClientImpl implements MDNSClient, NetworkAddressChangeListener
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) {