From 42db616f2de274ddf780de178d603b198cdd9b62 Mon Sep 17 00:00:00 2001 From: Michael Lobstein Date: Fri, 11 Sep 2020 14:24:18 -0500 Subject: [PATCH] Fix hardcoded network prefix Signed-off-by: Michael Lobstein --- .../opensprinkler/internal/OpenSprinklerBindingConstants.java | 1 - .../internal/discovery/OpenSprinklerDiscoveryService.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/OpenSprinklerBindingConstants.java b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/OpenSprinklerBindingConstants.java index 7ca60820d0b33..a9dd8eff55516 100644 --- a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/OpenSprinklerBindingConstants.java +++ b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/OpenSprinklerBindingConstants.java @@ -39,7 +39,6 @@ public class OpenSprinklerBindingConstants { public static final int DEFAULT_WAIT_BEFORE_INITIAL_REFRESH = 30; public static final int DEFAULT_REFRESH_RATE = 60; - public static final short DISCOVERY_SUBNET_MASK = 24; public static final int DISCOVERY_THREAD_POOL_SIZE = 15; public static final boolean DISCOVERY_DEFAULT_AUTO_DISCOVER = false; public static final int DISCOVERY_DEFAULT_TIMEOUT_RATE = 500; diff --git a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/discovery/OpenSprinklerDiscoveryService.java b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/discovery/OpenSprinklerDiscoveryService.java index c9b58d6937cc2..9cfcc234fccd2 100644 --- a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/discovery/OpenSprinklerDiscoveryService.java +++ b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/discovery/OpenSprinklerDiscoveryService.java @@ -132,7 +132,7 @@ private List getIpAddressScanList() throws UnknownHostException, SocketE for (InterfaceAddress address : networkInterface.getInterfaceAddresses()) { InetAddress ipAddress = address.getAddress(); - String cidrSubnet = ipAddress.getHostAddress() + "/" + DISCOVERY_SUBNET_MASK; + String cidrSubnet = ipAddress.getHostAddress() + "/" + address.getNetworkPrefixLength(); /* Apache Subnet Utils only supports IP v4 for creating string list of IP's */ if (ipAddress instanceof Inet4Address) {