mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Added the lookup of IP if device hostname is a hostname
This commit is contained in:
@@ -1040,3 +1040,17 @@ function version_info($remote=true) {
|
||||
return $output;
|
||||
|
||||
}//end version_info()
|
||||
|
||||
/**
|
||||
* Convert a MySQL binary v4 (4-byte) or v6 (16-byte) IP address to a printable string.
|
||||
* @param string $ip A binary string containing an IP address, as returned from MySQL's INET6_ATON function
|
||||
* @return string Empty if not valid.
|
||||
*/
|
||||
// Fuction is from http://uk3.php.net/manual/en/function.inet-ntop.php
|
||||
function inet6_ntop($ip) {
|
||||
$l = strlen($ip);
|
||||
if ($l == 4 or $l == 16) {
|
||||
return inet_ntop(pack('A' . $l, $ip));
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
@@ -1320,3 +1320,28 @@ function oxidized_reload_nodes() {
|
||||
curl_close($ch);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Perform DNS lookup
|
||||
*
|
||||
* @param array $device Device array from database
|
||||
* @param string $type The type of record to lookup
|
||||
*
|
||||
* @return string ip
|
||||
*
|
||||
**/
|
||||
function dnslookup($device,$type=false) {
|
||||
if (empty($type)) {
|
||||
// We are going to use the transport to work out the record type
|
||||
if ($device['transport'] == 'udp6' || $device['transport'] == 'tcp6') {
|
||||
$type = DNS_AAAA;
|
||||
$return = 'ipv6';
|
||||
}
|
||||
else {
|
||||
$type = DNS_A;
|
||||
$return = 'ip';
|
||||
}
|
||||
}
|
||||
$record = dns_get_record($device['hostname'],$type);
|
||||
return $record[0][$return];
|
||||
}//end dnslookup
|
||||
|
||||
@@ -138,6 +138,14 @@ function poll_device($device, $options) {
|
||||
$device_start = microtime(true);
|
||||
// Start counting device poll time
|
||||
echo $device['hostname'].' '.$device['device_id'].' '.$device['os'].' ';
|
||||
$ip = dnslookup($device);
|
||||
|
||||
if (!empty($ip) && $ip != inet6_ntop($device['ip'])) {
|
||||
log_event('Device IP changed to '.$ip, $device, 'system');
|
||||
$db_ip = inet_pton($ip);
|
||||
dbUpdate(array('ip' => $db_ip), 'devices', 'device_id=?', array($device['device_id']));
|
||||
}
|
||||
|
||||
if ($config['os'][$device['os']]['group']) {
|
||||
$device['os_group'] = $config['os'][$device['os']]['group'];
|
||||
echo '('.$device['os_group'].')';
|
||||
|
||||
Reference in New Issue
Block a user