From 01687f1aa3cdb6cec1f17e2e1a613f98de13c8df Mon Sep 17 00:00:00 2001
From: HenocKA <henoc.khouilla@gmail.com>
Date: Thu, 14 Apr 2016 11:20:07 +0200
Subject: [PATCH] Revert "arp-table discovery - bug correction"

This reverts commit 1c85af87bad661b5f180d26d88e25ee45ea54d14.
---
 includes/discovery/arp-table.inc.php | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/includes/discovery/arp-table.inc.php b/includes/discovery/arp-table.inc.php
index 657e6bbce4..69b0d9b750 100644
--- a/includes/discovery/arp-table.inc.php
+++ b/includes/discovery/arp-table.inc.php
@@ -4,16 +4,6 @@ unset($mac_table);
 
 echo 'ARP Table : ';
 
-if( key_exists('vrf_lite_cisco', $device) && (count($device['vrf_lite_cisco'])!=0) ){
-    $vrfs_lite_cisco = $device['vrf_lite_cisco'];
-}
-else  {
-    $vrfs_lite_cisco = array(array('context_name'=>null));
-}
-
-foreach ($vrfs_lite_cisco as $vrf) {
-    $device['context_name']=$vrf['context_name'];
-    
 $ipNetToMedia_data = snmp_walk($device, 'ipNetToMediaPhysAddress', '-Oq', 'IP-MIB');
 $ipNetToMedia_data = str_replace('ipNetToMediaPhysAddress.', '', trim($ipNetToMedia_data));
 $ipNetToMedia_data = str_replace('IP-MIB::', '', trim($ipNetToMedia_data));
@@ -58,7 +48,7 @@ foreach (explode("\n", $ipNetToMedia_data) as $data) {
                 log_event("MAC change: $ip : ".mac_clean_to_readable($old_mac).' -> '.mac_clean_to_readable($clean_mac), $device, 'interface', $interface['port_id']);
             }
 
-                dbUpdate(array('mac_address' => $clean_mac, 'context_name' => $device['context_name']), 'ipv4_mac', 'port_id=? AND ipv4_address=?', array($interface['port_id'], $ip));
+            dbUpdate(array('mac_address' => $clean_mac), 'ipv4_mac', 'port_id=? AND ipv4_address=?', array($interface['port_id'], $ip));
             echo '.';
         }
         else if (isset($interface['port_id'])) {
@@ -68,8 +58,8 @@ foreach (explode("\n", $ipNetToMedia_data) as $data) {
                             'port_id'      => $interface['port_id'],
                             'mac_address'  => $clean_mac,
                             'ipv4_address' => $ip,
-                            'context_name' => $device['context_name'],
                            );
+
             dbInsert($insert_data, 'ipv4_mac');
         }//end if
     }//end if
@@ -86,8 +76,6 @@ foreach (dbFetchRows($sql) as $entry) {
         echo '-';
     }
 }
+
 echo "\n";
 unset($mac);
-    unset($device['context_name']);
-}
-unset($vrfs_c);