nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-27 16:08:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

bye bye ipcalc, + cleanup of cleanup.php

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1809 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-08 18:17:49 +00:00
parent 694b31fcad
commit 69d6317c2e
4 changed files with 72 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/defaults.inc.php
-1
View File
@@ -13,7 +13,6 @@ $config['log_file'] = $config['install_dir'] . "/observium.log";
$config['sipcalc'] = "/usr/bin/sipcalc";
$config['rrdtool'] = "/usr/bin/rrdtool";
$config['fping'] = "/usr/bin/fping";
$config['ipcalc'] = "/usr/bin/ipcalc";
$config['snmpwalk'] = "/usr/bin/snmpwalk";
$config['snmpget'] = "/usr/bin/snmpget";
$config['snmpbulkwalk'] = "/usr/bin/snmpbulkwalk";
includes/functions.php
+2 -2
View File
@@ -324,8 +324,8 @@ function scanUDP ($host, $port, $timeout)
function netmask2cidr($netmask)
{
list ($network, $cidr) = explode("/", trim(`ipcalc $address/$mask | grep Network | cut -d" " -f 4`));
return $cidr;
$addr = Net_IPv4::parseAddress("1.2.3.4/$netmask");
return $addr->bitmask;
}
function cidr2netmask()