bye bye ipcalc, + cleanup of cleanup.php

git-svn-id: http://www.observium.org/svn/observer/trunk@1809 61d68cd4-352d-0410-923a-c4978735b2b8
2024-10-07 16:52:45 +00:00 · 2011-03-08 18:17:49 +00:00
parent 694b31fcad
commit 69d6317c2e
4 changed files with 72 additions and 50 deletions
@@ -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()