Skip to content

[knx] Skip already discovered Things during device discovery #19828

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

Closed
holgerfriedrich wants to merge 2 commits into from
Closed

[knx] Skip already discovered Things during device discovery #19828

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d74197
[knx] Skip already discovered Things during device discovery
holgerfriedrich Dec 18, 2025
67b8358
spotless
holgerfriedrich Dec 19, 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
32 changes: 27 additions & 5 deletions ....knx/src/main/java/org/openhab/binding/knx/internal/discovery/KNXnetDiscoveryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@
import org.openhab.core.config.discovery.AbstractDiscoveryService;
import org.openhab.core.config.discovery.DiscoveryResultBuilder;
import org.openhab.core.config.discovery.DiscoveryService;
import org.openhab.core.thing.ThingRegistry;
import org.openhab.core.thing.ThingUID;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -50,9 +53,12 @@ public class KNXnetDiscoveryService extends AbstractDiscoveryService {
private final Logger logger = LoggerFactory.getLogger(KNXnetDiscoveryService.class);

private @Nullable Future<?> scanFuture = null;
private final ThingRegistry thingRegistry;
Copy link
Member

@kaikreuzer kaikreuzer Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afair, discovery services should not have a dependency on the thing registry.

Anyhow, I do not think this is the right approach, see also my comment at #19824.


public KNXnetDiscoveryService() {
@Activate
public KNXnetDiscoveryService(@Reference ThingRegistry thingRegistry) {
super(Set.of(THING_TYPE_IP_BRIDGE), 3, true);
this.thingRegistry = thingRegistry;
}

@Override
Expand Down Expand Up @@ -84,6 +90,15 @@ protected void stopScan() {
}
}

// this filter prevents adding devices that are already registered as Things
private boolean filtered(ThingUID uid) {
if (thingRegistry.get(uid) != null) {
logger.debug("Ignoring device {} as it is already registered", uid);
return true;
}
return false;
}

private synchronized void startDiscovery() {
try {
logger.debug("Starting KNXnet/IP discovery scan");
Expand All @@ -109,16 +124,23 @@ private synchronized void startDiscovery() {
}

if (services.containsKey(ServiceFamiliesDIB.ServiceFamily.Tunneling)) {
thingDiscovered(DiscoveryResultBuilder.create(new ThingUID(THING_TYPE_IP_BRIDGE, serial))
.withLabel(response.getDevice().getName()).withProperty("serialNumber", serial)
.withProperty("type", "TUNNEL")
ThingUID uid = new ThingUID(THING_TYPE_IP_BRIDGE, serial);
if (filtered(uid)) {
continue;
}
thingDiscovered(DiscoveryResultBuilder.create(uid).withLabel(response.getDevice().getName())
.withProperty("serialNumber", serial).withProperty("type", "TUNNEL")
.withProperty("ipAddress",
"" + response.getControlEndpoint().endpoint().getAddress().getHostAddress())
.withProperty("port", "" + response.getControlEndpoint().endpoint().getPort())
.withRepresentationProperty("serialNumber").build());
}
if (services.containsKey(ServiceFamiliesDIB.ServiceFamily.Routing)) {
thingDiscovered(DiscoveryResultBuilder.create(new ThingUID(THING_TYPE_IP_BRIDGE, serial))
ThingUID uid = new ThingUID(THING_TYPE_IP_BRIDGE, serial);
if (filtered(uid)) {
continue;
}
thingDiscovered(DiscoveryResultBuilder.create(uid)
.withLabel(response.getDevice().getName() + " (router mode)")
.withProperty("serialNumber", serial + "-r").withProperty("type", "ROUTER")
.withProperty("ipAddress", "224.0.23.12")
Expand Down