ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

cleaned up ping code

Browse source
This commit is contained in:
Ziver Koc 2017-03-18 18:34:04 +01:00
parent 9abf7c0952
commit 160c437430
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/se/hal/plugin/netscan/NetScanController.java
View file

@ -68,14 +68,14 @@ public class NetScanController implements HalEventController, HalAutoScannableCo
NetworkDevice device = entry.getKey(); NetworkDevice device = entry.getKey();
SwitchEventData prevData = entry.getValue(); SwitchEventData prevData = entry.getValue();
if (listener != null) { if (listener != null) {
//logger.finest("Pinging IP "+ device.getHost()); // We ping two times to increase reliability
boolean ping1 = InetScanner.isReachable(device.getHost(), executor); boolean ping = false;
boolean ping2 = InetScanner.isReachable(device.getHost(), executor); ping |= InetScanner.isReachable(device.getHost(), executor);
ping |= InetScanner.isReachable(device.getHost(), executor);
// Should we report? // Should we report?
if (prevData == null || if (prevData == null || prevData.isOn() != ping) {
(ping1 == ping2 && prevData.isOn() != ping1)) { // only store if we get consistent pings SwitchEventData newData = new SwitchEventData(ping, System.currentTimeMillis());
SwitchEventData newData = new SwitchEventData(ping1, System.currentTimeMillis());
entry.setValue(newData); entry.setValue(newData);
logger.fine("IP "+device.getHost() +" state has changed to "+ newData.isOn()); logger.fine("IP "+device.getHost() +" state has changed to "+ newData.isOn());
listener.reportReceived(device, newData); listener.reportReceived(device, newData);