From e250424f277ca550fd2e1b86930e00ee95e9ac37 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Wed, 13 Jan 2010 23:40:07 +0000
Subject: [PATCH] move arp table polling out of cisco mac accounting file, this
 works on other devices as well - tested on linux/net-snmp and junos

git-svn-id: http://www.observium.org/svn/observer/trunk@678 61d68cd4-352d-0410-923a-c4978735b2b8
---
 discovery.php                               |  2 +
 includes/discovery/arp-table.php            | 63 +++++++++++++++++++++
 includes/discovery/cisco-mac-accounting.php | 61 --------------------
 3 files changed, 65 insertions(+), 61 deletions(-)
 create mode 100644 includes/discovery/arp-table.php

diff --git a/discovery.php b/discovery.php
index f386747fe..ac72df40a 100755
--- a/discovery.php
+++ b/discovery.php
@@ -80,6 +80,8 @@ while ($device = mysql_fetch_array($device_query)) {
   ## CDP & LLDP
   include("includes/discovery/cdp-lldp.inc.php");
 
+  ## ARP Table
+  include("includes/discovery/arp-table.php");
 
   if($device['os'] == "netscreen") { 
     if ($device['type'] == "unknown") { $device['type'] = 'firewall'; }
diff --git a/includes/discovery/arp-table.php b/includes/discovery/arp-table.php
new file mode 100644
index 000000000..0ad8cb707
--- /dev/null
+++ b/includes/discovery/arp-table.php
@@ -0,0 +1,63 @@
+<?php
+  unset ($mac_table);
+
+  echo("ARP Table : ");
+
+  $ipNetToMedia_data = shell_exec($config['snmpbulkwalk'] . " -m IP-MIB -Oq -".$device['snmpver']." -c ".$device['community']." ".$device['hostname']." ipNetToMediaPhysAddress");
+  $ipNetToMedia_data = str_replace("ipNetToMediaPhysAddress.", "", trim($ipNetToMedia_data));
+  $ipNetToMedia_data = str_replace("IP-MIB::", "", trim($ipNetToMedia_data));
+  #echo("$ipNetToMedia_data\n");
+  #echo("done\n");
+  foreach(explode("\n", $ipNetToMedia_data) as $data) {
+    list($oid, $mac) = explode(" ", $data);
+    list($if, $first, $second, $third, $fourth) = explode(".", $oid);
+    list($m_a, $m_b, $m_c, $m_d, $m_e, $m_f) = explode(":", $mac); 
+    $interface = mysql_fetch_array(mysql_query("SELECT * FROM interfaces WHERE device_id = '".$device['device_id']."' AND ifIndex = '".$if."'"));
+    $ip = $first .".". $second .".". $third .".". $fourth;
+    $m_a = zeropad($m_a);
+    $m_b = zeropad($m_b);
+    $m_c = zeropad($m_c);
+    $m_d = zeropad($m_d);
+    $m_e = zeropad($m_e);
+    $m_f = zeropad($m_f);
+    $md_a = hexdec($m_a);
+    $md_b = hexdec($m_b);
+    $md_c = hexdec($m_c);
+    $md_d = hexdec($m_d);
+    $md_e = hexdec($m_e);
+    $md_f = hexdec($m_f);
+    $mac = "$m_a:$m_b:$m_c:$m_d:$m_e:$m_f"; 
+    $mac_table[$if][$mac]['ip'] =  $ip;
+    $mac_table[$if][$mac]['ciscomac'] = "$m_a$m_b.$m_c$m_d.$m_e$m_f";
+    $clean_mac = $m_a . $m_b . $m_c . $m_d . $m_e . $m_f;    
+    $mac_table[$if][$mac]['cleanmac'] = $clean_mac;
+    $interface_id = $interface['interface_id'];
+    $mac_table[$interface_id][$clean_mac] = 1;
+    if(mysql_result(mysql_query("SELECT COUNT(*) from ipv4_mac WHERE interface_id = '".$interface['interface_id']."' AND ipv4_address = '$ip'"),0)) {
+      $sql = "UPDATE `ipv4_mac` SET `mac_address` = '$clean_mac' WHERE interface_id = '".$interface['interface_id']."' AND ipv4_address = '$ip'";
+      mysql_query($sql);
+      echo(".");
+    } else {
+      echo("+");
+      #echo("Add MAC $mac\n");
+      mysql_query("INSERT INTO `ipv4_mac` (interface_id, mac_address, ipv4_address) VALUES ('".$interface['interface_id']."','$clean_mac','$ip')");
+    }
+    $interface_id = $interface['interface_id'];
+  }
+  $sql = "SELECT * from ipv4_mac AS M, interfaces as I WHERE M.interface_id = I.interface_id and I.device_id = '".$device['device_id']."'";
+  $query = mysql_query($sql);
+  while($entry = mysql_fetch_array($query)) {
+    $entry_mac = $entry['mac_address'];
+    $entry_if  = $entry['interface_id'];
+    if(!$mac_table[$entry_if][$entry_mac]) {
+      mysql_query("DELETE FROM ipv4_mac WHERE interface_id = '".$entry_if."' AND mac_address = '".$entry_mac."'");
+      #echo("Removing MAC $entry_mac from interface ".$interface['ifName']);
+      echo("-");
+    } 
+  }
+
+  echo("\n");
+
+  unset($mac);
+
+?>
diff --git a/includes/discovery/cisco-mac-accounting.php b/includes/discovery/cisco-mac-accounting.php
index e6235e534..a58910f96 100755
--- a/includes/discovery/cisco-mac-accounting.php
+++ b/includes/discovery/cisco-mac-accounting.php
@@ -1,66 +1,5 @@
 <?php
 
-  unset ($mac_table);
-
-  echo("ARP Table : ");
-
-  $ipNetToMedia_data = shell_exec($config['snmpbulkwalk'] . " -m IP-MIB -Oq -".$device['snmpver']." -c ".$device['community']." ".$device['hostname']." ipNetToMediaPhysAddress");
-  $ipNetToMedia_data = str_replace("ipNetToMediaPhysAddress.", "", trim($ipNetToMedia_data));
-  $ipNetToMedia_data = str_replace("IP-MIB::", "", trim($ipNetToMedia_data));
-  #echo("$ipNetToMedia_data\n");
-  #echo("done\n");
-  foreach(explode("\n", $ipNetToMedia_data) as $data) {
-    list($oid, $mac) = explode(" ", $data);
-    list($if, $first, $second, $third, $fourth) = explode(".", $oid);
-    list($m_a, $m_b, $m_c, $m_d, $m_e, $m_f) = explode(":", $mac); 
-    $interface = mysql_fetch_array(mysql_query("SELECT * FROM interfaces WHERE device_id = '".$device['device_id']."' AND ifIndex = '".$if."'"));
-    $ip = $first .".". $second .".". $third .".". $fourth;
-    $m_a = zeropad($m_a);
-    $m_b = zeropad($m_b);
-    $m_c = zeropad($m_c);
-    $m_d = zeropad($m_d);
-    $m_e = zeropad($m_e);
-    $m_f = zeropad($m_f);
-    $md_a = hexdec($m_a);
-    $md_b = hexdec($m_b);
-    $md_c = hexdec($m_c);
-    $md_d = hexdec($m_d);
-    $md_e = hexdec($m_e);
-    $md_f = hexdec($m_f);
-    $mac = "$m_a:$m_b:$m_c:$m_d:$m_e:$m_f"; 
-    $mac_table[$if][$mac]['ip'] =  $ip;
-    $mac_table[$if][$mac]['ciscomac'] = "$m_a$m_b.$m_c$m_d.$m_e$m_f";
-    $clean_mac = $m_a . $m_b . $m_c . $m_d . $m_e . $m_f;    
-    $mac_table[$if][$mac]['cleanmac'] = $clean_mac;
-    $interface_id = $interface['interface_id'];
-    $mac_table[$interface_id][$clean_mac] = 1;
-    if(mysql_result(mysql_query("SELECT COUNT(*) from ipv4_mac WHERE interface_id = '".$interface['interface_id']."' AND ipv4_address = '$ip'"),0)) {
-      $sql = "UPDATE `ipv4_mac` SET `mac_address` = '$clean_mac' WHERE interface_id = '".$interface['interface_id']."' AND ipv4_address = '$ip'";
-      mysql_query($sql);
-      echo(".");
-    } else {
-      echo("+");
-      #echo("Add MAC $mac\n");
-      mysql_query("INSERT INTO `ipv4_mac` (interface_id, mac_address, ipv4_address) VALUES ('".$interface['interface_id']."','$clean_mac','$ip')");
-    }
-    $interface_id = $interface['interface_id'];
-  }
-  $sql = "SELECT * from ipv4_mac AS M, interfaces as I WHERE M.interface_id = I.interface_id and I.device_id = '".$device['device_id']."'";
-  $query = mysql_query($sql);
-  while($entry = mysql_fetch_array($query)) {
-    $entry_mac = $entry['mac_address'];
-    $entry_if  = $entry['interface_id'];
-    if(!$mac_table[$entry_if][$entry_mac]) {
-      mysql_query("DELETE FROM ipv4_mac WHERE interface_id = '".$entry_if."' AND mac_address = '".$entry_mac."'");
-      #echo("Removing MAC $entry_mac from interface ".$interface['ifName']);
-      echo("-");
-    } 
-  }
-
-  echo("\n");
-
-  unset($mac);
-
   echo("MAC Accounting : ");
 
   $datas = shell_exec($config['snmpbulkwalk'] . " -m CISCO-IP-STAT-MIB -Oqn -".$device['snmpver']." -c ".$device['community']." ".$device['hostname']." cipMacSwitchedBytes");