demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

fix upnp support to handle embededd devices (#4712)

Browse Source 
Signed-off-by: Laurent ARNAL <laurent@clae.net>
This commit is contained in:
lo92fr
2025-04-10 09:29:00 +02:00
committed by GitHub
parent 013de041ca
commit 601477d4cf
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/internal/UpnpDiscoveryService.java
+4
View File
@@ -149,6 +149,10 @@ public class UpnpDiscoveryService extends AbstractDiscoveryService
protected void startScan() {
for (RemoteDevice device : upnpService.getRegistry().getRemoteDevices()) {
remoteDeviceAdded(upnpService.getRegistry(), device);
for (RemoteDevice childDevice : device.getEmbeddedDevices()) {
remoteDeviceAdded(upnpService.getRegistry(), childDevice);
}
}
upnpService.getRegistry().addListener(this);
upnpService.getControlPoint().search();
bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceImpl.java
+10 -2
View File
@@ -216,7 +216,7 @@ public class UpnpIOServiceImpl implements UpnpIOService, RegistryListener {
}
private Device getDevice(UpnpIOParticipant participant) {
return upnpService.getRegistry().getDevice(new UDN(participant.getUDN()), true);
return upnpService.getRegistry().getDevice(new UDN(participant.getUDN()), false);
}
@Override
@@ -354,7 +354,7 @@ public class UpnpIOServiceImpl implements UpnpIOService, RegistryListener {
@Override
public boolean isRegistered(UpnpIOParticipant participant) {
return upnpService.getRegistry().getDevice(new UDN(participant.getUDN()), true) != null;
return upnpService.getRegistry().getDevice(new UDN(participant.getUDN()), false) != null;
}
@Override
@@ -508,6 +508,10 @@ public class UpnpIOServiceImpl implements UpnpIOService, RegistryListener {
@Override
public void remoteDeviceAdded(Registry registry, RemoteDevice device) {
informParticipants(device, true);
for (RemoteDevice childDevice : device.getEmbeddedDevices()) {
informParticipants(childDevice, true);
}
}
@Override
@@ -517,6 +521,10 @@ public class UpnpIOServiceImpl implements UpnpIOService, RegistryListener {
@Override
public void remoteDeviceRemoved(Registry registry, RemoteDevice device) {
informParticipants(device, false);
for (RemoteDevice childDevice : device.getEmbeddedDevices()) {
informParticipants(childDevice, false);
}
}
@Override