135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check device is in storage before comparing last_* times with *_min_age

Browse Source
This commit is contained in:
Oliver Gorwits
2013-08-27 10:09:36 +01:00
parent 56eab3108b
commit 292e63087e
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/Changes
View File

@@ -1,3 +1,9 @@
2.014001 - 2013-08-27
[BUG FIXES]
* Check device is in storage before comparing last_* times with *_min_age
2.014000 - 2013-08-26
[NEW FEATURES]

9
Netdisco/lib/App/Netdisco/Util/Device.pm
View File

@@ -149,6 +149,9 @@ sub is_discoverable {
return _bail_msg("is_discoverable: device failed to match discover_only")
if check_no($device, 'discover_only');
# cannot check last_discover for as yet undiscovered devices :-)
return 1 if not $device->in_storage;
if ($device->since_last_discover and setting('discover_min_age')
and $device->since_last_discover < setting('discover_min_age')) {
@@ -180,6 +183,9 @@ sub is_arpnipable {
return _bail_msg("is_arpnipable: device failed to match arpnip_only")
if check_no($device, 'arpnip_only');
return _bail_msg("is_arpnipable: cannot arpnip an undiscovered device")
if not $device->in_storage;
if ($device->since_last_arpnip and setting('arpnip_min_age')
and $device->since_last_arpnip < setting('arpnip_min_age')) {
@@ -211,6 +217,9 @@ sub is_macsuckable {
return _bail_msg("is_macsuckable: device failed to match macsuck_only")
if check_no($device, 'macsuck_only');
return _bail_msg("is_macsuckable: cannot macsuck an undiscovered device")
if not $device->in_storage;
if ($device->since_last_macsuck and setting('macsuck_min_age')
and $device->since_last_macsuck < setting('macsuck_min_age')) {