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

sid3windr fixes

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@585 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-01-02 17:12:04 +00:00
parent bdf954cde3
commit 1e16f185ef
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/discovery/ipv6-addresses.php
View File

@ -39,7 +39,7 @@ if (!$oids)
if($data) { if($data) {
$data = trim($data); $data = trim($data);
list($if_ipv6addr,$ipv6_prefixlen) = explode(" ", $data); list($if_ipv6addr,$ipv6_prefixlen) = explode(" ", $data);
list($ifindex,$ipv6addr) = split("\\.",$if_ipv6addr,2); list($ifIndex,$ipv6addr) = split("\\.",$if_ipv6addr,2);
$ipv6_address = snmp2ipv6($ipv6addr); $ipv6_address = snmp2ipv6($ipv6addr);
$ipv6_origin = trim(shell_exec($config['snmpget']." -m IPV6-MIB -Ovq -".$device['snmpver']." -c ".$device['community']." ".$device['hostname'].":".$device['port']." IPV6-MIB::ipv6AddrType.$if_ipv6addr")); $ipv6_origin = trim(shell_exec($config['snmpget']." -m IPV6-MIB -Ovq -".$device['snmpver']." -c ".$device['community']." ".$device['hostname'].":".$device['port']." IPV6-MIB::ipv6AddrType.$if_ipv6addr"));

5
includes/functions.php
View File

@ -684,13 +684,12 @@ function snmp2ipv6($ipv6_snmp)
function ipv62snmp($ipv6) function ipv62snmp($ipv6)
{ {
$ipv6_ex = explode(':',Net_IPv6::uncompress($ipv6)); $ipv6_ex = explode(':',Net_IPv6::uncompress($ipv6));
for ($i = 0;$i < 8;$i++) { while (strlen($ipv6_ex[$i]) < 4) $ipv6_ex[$i] = "0" . $ipv6_ex[$i]; } # Pad zeroes back for ($i = 0;$i < 8;$i++) { $ipv6_ex[$i] = zeropad_lineno($ipv6_ex[$i]); }
$ipv6_ip = implode('',$ipv6_ex); $ipv6_ip = implode('',$ipv6_ex);
for ($i = 0;$i < 16;$i+=2) $ipv6_split[] = hexdec(substr($ipv6_ip,$i,2)); for ($i = 0;$i < 16;$i+=2) $ipv6_split[] = hexdec(substr($ipv6_ip,$i,2));
return implode($ipv6_split,'.'); return implode('.',$ipv6_split);
} }
function discover_process_ipv6($ifIndex,$ipv6_address,$ipv6_prefixlen,$ipv6_origin) function discover_process_ipv6($ifIndex,$ipv6_address,$ipv6_prefixlen,$ipv6_origin)
{ {
global $valid_v6,$device,$config; global $valid_v6,$device,$config;