135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#162] Change from Net::MAC to NetAddr::MAC

Browse Source 
Note that IEEE and Microsoft are the WRONG WAY ROUND in NetAddr::MAC. I've
emailed the author about this. A dirty hack is in place to deal with it.
This commit is contained in:
Oliver Gorwits
2014-11-14 22:49:07 +00:00
parent e4c668fb12
commit a308d1a177
15 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Netdisco/lib/App/Netdisco/Core/Discover.pm
View File

@@ -10,7 +10,7 @@ use NetAddr::IP::Lite ':lower';
use List::MoreUtils ();
use Encode;
use Try::Tiny;
use Net::MAC;
use NetAddr::MAC;
use base 'Exporter';
our @EXPORT = ();
@@ -754,9 +754,9 @@ sub store_neighbors {
$device->ip, $remote_ip, $port, $remote_id;
if (!defined $neigh) {
my $mac = Net::MAC->new(mac => $remote_id, 'die' => 0, verbose => 0);
if (not $mac->get_error) {
$neigh = $devices->single({mac => $mac->as_IEEE()});
my $mac = NetAddr::MAC->new(mac => $remote_id);
if ($mac and not $mac->errstr) {
$neigh = $devices->single({mac => $mac->as_microsoft()});
}
}
@@ -765,13 +765,13 @@ sub store_neighbors {
# "myswitchname(012345-012345)"
if (!defined $neigh) {
(my $tmpid = $remote_id) =~ s/.([0-9a-f]{6})-([0-9a-f]{6})./$1$2/;
my $mac = Net::MAC->new(mac => $tmpid, 'die' => 0, verbose => 0);
my $mac = NetAddr::MAC->new(mac => $tmpid);
if (not $mac->get_error) {
if ($mac and not $mac->errstr) {
info sprintf
'[%s] neigh - found neighbor %s by MAC %s',
$device->ip, $remote_id, $mac->as_IEEE();
$neigh = $devices->single({mac => $mac->as_IEEE()});
$device->ip, $remote_id, $mac->as_microsoft();
$neigh = $devices->single({mac => $mac->as_microsoft()});
}
}