Skip to content
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

Jump to bottom

[opensprinkler] fix hardcoded network prefix in discovery service #8456

Merged
merged 16 commits into from
Sep 12, 2020
Merged

[opensprinkler] fix hardcoded network prefix in discovery service #8456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
29400b5
Merge pull request #1 from openhab/2.5.x
mlobstein Apr 13, 2020
37d791e
Merge pull request #2 from openhab/2.5.x
mlobstein Apr 19, 2020
82462cd
Merge pull request #3 from openhab/2.5.x
mlobstein May 27, 2020
5d548cc
Merge pull request #4 from openhab/2.5.x
mlobstein Jun 4, 2020
41709ef
Merge pull request #5 from openhab/2.5.x
mlobstein Jun 24, 2020
b3285d6
Merge pull request #6 from openhab/2.5.x
mlobstein Jul 16, 2020
9b57919
Merge pull request #7 from openhab/2.5.x
mlobstein Jul 25, 2020
78f6977
Merge pull request #8 from openhab/2.5.x
mlobstein Jul 28, 2020
f49106b
Merge pull request #9 from openhab/2.5.x
mlobstein Aug 22, 2020
ce6b1b8
Merge branch '2.5.x' of https://github.com/openhab/openhab-addons int…
mlobstein Aug 26, 2020
31227c5
Merge branch '2.5.x' of https://github.com/openhab/openhab-addons int…
mlobstein Aug 26, 2020
86a5327
Merge remote-tracking branch 'upstream/2.5.x' into 2.5.x
mlobstein Sep 3, 2020
a649668
Merge remote-tracking branch 'upstream/2.5.x' into 2.5.x
mlobstein Sep 3, 2020
05fbbaf
Merge remote-tracking branch 'upstream/2.5.x' into 2.5.x
mlobstein Sep 9, 2020
a45901a
Merge remote-tracking branch 'upstream/2.5.x' into 2.5.x
mlobstein Sep 9, 2020
42db616
Fix hardcoded network prefix
mlobstein Sep 11, 2020
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
1 change: 0 additions & 1 deletion ...c/main/java/org/openhab/binding/opensprinkler/internal/OpenSprinklerBindingConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/openhab/binding/opensprinkler/internal/discovery/OpenSprinklerDiscoveryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down