Changeset 7768

Timestamp:

Apr 15, 2010, 5:24:10 PM (15 years ago)

Author:

Pieter Naber

Message:

Finished with the Network class, created kml.php for an up-to-date KML file. Waiting for Davids code...

Location:

trunk/src

Files:

• config.php (modified) (1 diff)
• example.kml (deleted)
• inc/Network.class.php (modified) (3 diffs)
• kml (added)
• kml.php (added)
• logfile.txt (modified) (1 diff)
• test (added)
• test/testNetwork.php (added)

trunk/src/config.php

@@ -51 +51 @@
  * Values to generate map
  */
-$config['kml_file']                     = $config['root']."/map/inc/example.kml";
+$config['kml_file']                     = $config['root'] . '/map/inc/example.kml';
+// Should be something like:
+// $config['kml_file']          = $config['root'] . '/kml.php?time=%TIMESTAMP%';
 ?>

trunk/src/inc/Network.class.php

@@ -8 +8 @@
 class Network {
         public $netmaskNumber;          // Netmask number
-        public $netmaskBinair;          // Binair value of netmask address
+        public $netmaskBinary;          // Binary value of netmask address
         public $netmaskDecimal;         // Decimal value of netmask address
-        public $wildcardBinair;         // Binair value of wildcard address
+        public $wildcardBinary;         // Binary value of wildcard address
         public $wildcardDecimal;        // Decimal value of wildcard address
-        public $networkBinair;          // Binair value of network address
+        public $networkBinary;          // Binary value of network address
         public $networkDecimal;         // Decimal value of network address
-        public $broadcastBinair;        // Binair value of broadcast address
+        public $broadcastBinary;        // Binary value of broadcast address
         public $broadcastDecimal;       // Decimal value of broadcast address
-        public $hostminBinair;          // Binair value of hostmin address
+        public $hostminBinary;          // Binary value of hostmin address
         public $hostminDecimal;         // Decimal value of hostmin address
-        public $hostmaxBinair;          // Binair value of hostmax address
+        public $hostmaxBinary;          // Binary value of hostmax address
         public $hostmaxDecimal;         // Decimal value of hostmax address
         public $numberHosts;            // Number of possible hosts in this network
@@ -29 +29 @@
          */
         public function __construct($ip_address, $ip_netmask) {
-                // Binair value of given IP address
-                $binair = $this->binIP($ip_address);
+                // Binary value of given IP address
+                $binary = $this->binIP($ip_address);
 
                 // Let's store the IP netmask number
@@ -36 +36 @@
 
                 // Netmask address
-                $this->netmaskBinair = str_repeat('1', $ip_netmask) . str_repeat('0', 32 - $ip_netmask);
-                $this->netmaskDecimal = $this->decIP($this->netmaskBinair);
+                $this->netmaskBinary = str_repeat('1', $ip_netmask) . str_repeat('0', 32 - $ip_netmask);
+                $this->netmaskDecimal = $this->decIP($this->netmaskBinary);
 
                 // Wildcard address
-                $this->wildcardBinair = str_repeat('0', $ip_netmask) . str_repeat('1', 32 - $ip_netmask);
-                $this->wildcardDecimal = $this->decIP($this->wildcardBinair);
+                $this->wildcardBinary = str_repeat('0', $ip_netmask) . str_repeat('1', 32 - $ip_netmask);
+                $this->wildcardDecimal = $this->decIP($this->wildcardBinary);
 
                 // Network address
-                $this->networkBinair = substr($binair, 0, $ip_netmask) . str_repeat('0', 32 - $ip_netmask);
-                $this->networkDecimal = $this->decIP($this->networkBinair);
+                $this->networkBinary = substr($binary, 0, $ip_netmask) . str_repeat('0', 32 - $ip_netmask);
+                $this->networkDecimal = $this->decIP($this->networkBinary);
 
                 // Broadcast address
-                $this->broadcastBinair = substr($binair, 0, $ip_netmask) . str_repeat('1', 32 - $ip_netmask);
-                $this->broadcastDecimal = $this->decIP($this->broadcastBinair);
+                $this->broadcastBinary = substr($binary, 0, $ip_netmask) . str_repeat('1', 32 - $ip_netmask);
+                $this->broadcastDecimal = $this->decIP($this->broadcastBinary);
 
                 // HostMin address
-                $this->hostminBinair = substr($binair, 0, $ip_netmask) . str_repeat('0', 31 - $ip_netmask) . '1';
-                $this->hostminDecimal = $this->decIP($this->hostminBinair);
+                $this->hostminBinary = substr($binary, 0, $ip_netmask) . str_repeat('0', 31 - $ip_netmask) . '1';
+                $this->hostminDecimal = $this->decIP($this->hostminBinary);
 
                 // HostMax address
-                $this->hostmaxBinair = substr($binair, 0, $ip_netmask) . str_repeat('1', 31 - $ip_netmask) . '0';
-                $this->hostmaxDecimal = $this->decIP($this->hostmaxBinair);
+                $this->hostmaxBinary = substr($binary, 0, $ip_netmask) . str_repeat('1', 31 - $ip_netmask) . '0';
+                $this->hostmaxDecimal = $this->decIP($this->hostmaxBinary);
 
                 // Numbers of hosts
-                $this->numberHosts = bindec(substr($this->broadcastBinair, $ip_netmask)) - bindec(substr($this->networkBinair, $ip_netmask)) - 1;
+                $this->numberHosts = bindec(substr($this->broadcastBinary, $ip_netmask)) - bindec(substr($this->networkBinary, $ip_netmask)) - 1;
         }
 
+        /*
+         * Function: binIP
+         * Description: Converts a IP address like 192.168.0.1 to it's binary value
+         * Parameters: string $address
+         * Returns: string $address_binary
+         */
         function binIP($address) {
                 $address_array = explode('.', $address);
-                $address_binair = '';
+                $address_binary = '';
 
                 for ($i = 0; $i < 4; $i++) {
-                        // Create binair value
-                        $binair = decbin($address_array[$i]);
+                        // Create binary value
+                        $binary = decbin($address_array[$i]);
 
                         // Trim value to the length
-                        $binair = trim($binair, 8);
+                        $binary = trim($binary, 8);
 
                         // Add zeros at the left to fit to $size
-                        $binair = str_repeat('0', 8 - strlen($binair)) . $binair;
+                        $binary = str_repeat('0', 8 - strlen($binary)) . $binary;
 
-                        $address_binair .= $binair;
+                        $address_binary .= $binary;
                 }
 
-                return $address_binair;
+                return $address_binary;
         }
 
-        function decIP($binair) {
+        /*
+         * Function: decIP
+         * Description: Converts a binary IP address to it's decimal value like 192.168.0.1
+         * Parameters: string $binary
+         * Returns: string $address
+         */
+        function decIP($binary) {
                 $address_array = array();
 
                 for ($i = 0; $i < 4; $i++) {
-                        $block = substr($binair, $i * 8, 8) . '<br/>';
+                        $block = substr($binary, $i * 8, 8) . '<br/>';
                         $address_array[] = bindec(intval($block));
                 }
 
-                return implode('.', $address_array);
+                $address = implode('.', $address_array); 
+
+                return $address;
         }
 
-        function inNetwork($ip_address) {
-                return false;
+        /*
+         * Function: compare
+         * Description: Checks if to networks are the same using network IP address
+         * Parameters: Network $otherNetwork
+         * Returns: true if the networks are the same, otherwise false
+         */
+        function compare(Network $otherNetwork) {
+                $check = false;
+
+                // Compare the network address
+                if ($this->networkDecimal == $otherNetwork->networkDecimal) {
+                        $check = true;
+                }
+
+                return $check;
+        }
+
+        /*
+         * Function: inNetwork
+         * Description: Checks if the given IP is in the IP range of the current network
+         * Parameters: string $ipDecimal
+         * Returns: true if the IP address is in the IP range, otherwise false
+         */
+        function inNetwork($ipDecimal) {
+                $check = true;
+
+                // Check if given IP is bigger than our HostMin IP Address
+                if (ip2long($ipDecimal) < ip2long($this->hostminDecimal)) {
+                        $check = false;
+                }
+
+                // Check if given IP is smaller than our HostMax IP Address
+                if (ip2long($ipDecimal) > ip2long($this->hostmaxDecimal)) {
+                        $check = false;
+                }
+                                
+                return $check;
         }
 }
-
-$ip = '172.16.0.245';
-$network = new Network($ip, 30);
-echo    '
-        Address: ' . $ip . ' / ' . Network::binIP($ip) . '<br/>
-        Netmask: ' . $network->netmaskDecimal . ' / ' . $network->netmaskBinair . '<br/>
-        Wildcard: ' . $network->wildcardDecimal . ' / ' . $network->wildcardBinair . '<br/>
-        Network: ' . $network->networkDecimal . ' / ' . $network->networkBinair . '<br/>
-        Broadcast: ' . $network->broadcastDecimal . ' / ' . $network->broadcastBinair . '<br/>
-        HostMin: ' . $network->hostminDecimal . ' / ' . $network->hostminBinair . '<br/>
-        HostMax: ' . $network->hostmaxDecimal . ' / ' . $network->hostmaxBinair . '<br/>
-        Hosts/Net: ' . $network->numberHosts . '<br/>';
 ?>

trunk/src/logfile.txt

@@ -1 @@
-Debug (8 | 15:20.40 04/15/10 | ): Reading from file "http://watch.wirelessleiden.nl/nagios/export/node-status.csv"
-        In file "D:\Workspace\NodeMap2.0\trunk\src\inc\FileHandler.class.php" on line "42"