mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1248 from laf/issue-594-ip

Browse Source 
Added function to check if ip already exists and updated addHost to use it
This commit is contained in:
Paul Gear
2015-06-13 10:09:06 +10:00
parent 6016c866bc e478a495f9
commit 0e3b0df29f
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
includes/functions.php
View File

@ -285,6 +285,7 @@ function addHost($host, $snmpver, $port = '161', $transport = 'udp', $quiet = '0
// Test Database Exists
if (dbFetchCell("SELECT COUNT(*) FROM `devices` WHERE `hostname` = ?", array($host)) == '0')
{
if (ip_exists($host) === false) {
// Test reachability
if ($force_add == 1 || isPingable($host))
{
@ -369,6 +370,11 @@ function addHost($host, $snmpver, $port = '161', $transport = 'udp', $quiet = '0
// failed Reachability
if($quiet == '0') { print_error("Could not ping $host"); }
}
} else {
if ($quiet == 0) {
print_error("Already have host with this IP $host");
}
}
} else {
// found in database
if($quiet == '0') { print_error("Already got host $host"); }
@ -1210,3 +1216,19 @@ function fix_integer_value($value) {
}
return $return;
}
function ip_exists($ip) {
// Function to check if an IP exists in the DB already
if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== FALSE) {
if (!dbFetchRow("SELECT `ipv6_address_id` FROM `ipv6_addresses` WHERE `ipv6_address` = ? OR `ipv6_compressed` = ?", array($ip,$ip))) {
return false;
}
} elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== FALSE) {
if (!dbFetchRow("SELECT `ipv4_address_id` FROM `ipv4_addresses` WHERE `ipv4_address` = ?", array($ip))) {
return false;
}
} else {
return false;
}
return true;
}