[opensprinkler] Fix hardcoded network prefix (openhab#8456)

Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>
andrewfg · Oct 8, 2020 · 5b0119d · 5b0119d
1 parent 72a3fa6
commit 5b0119d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/...c/main/java/org/openhab/binding/opensprinkler/internal/OpenSprinklerBindingConstants.java b/...c/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/...a/org/openhab/binding/opensprinkler/internal/discovery/OpenSprinklerDiscoveryService.java b/...a/org/openhab/binding/opensprinkler/internal/discovery/OpenSprinklerDiscoveryService.java
@@ -132,7 +132,7 @@ private List<String> 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) {