fix: Fix switch known macaddresses analysis

Author: g-bougard

Changes

@@ -29,6 +29,7 @@ netdiscovery/netinventory:
 * PR #836 from @eduardomozart: Enhanced HP wireless printers by reporting wifi ports
   as wireless
 * Fix network ports ip support to avoid wrong allocation in rare cases, seen on a Ricoh printer
+* Fix switch known macaddresses analysis
 
 deploy:
 * fix #854: Deploy task was not run when forced via httpd interface

lib/GLPI/Agent/Tools/Hardware.pm

@@ -863,7 +863,9 @@ sub _setKnownMacAddresses {
     # start with mac addresses seen on default VLAN
     my $addresses = _getKnownMacAddresses(
         snmp           => $snmp,
+        macaddresses   => '.1.3.6.1.2.1.17.4.3.1.1', # dot1dTpFdbAddress
         address2port   => '.1.3.6.1.2.1.17.4.3.1.2', # dot1dTpFdbPort
+        macstatus      => '.1.3.6.1.2.1.17.4.3.1.3', # dot1dTpFdbStatus
         port2interface => '.1.3.6.1.2.1.17.1.4.1.2', # dot1dBasePortIfIndex
     );
 
@@ -878,7 +880,9 @@ sub _setKnownMacAddresses {
     # add additional mac addresses for other VLANs
     $addresses = _getKnownMacAddresses(
         snmp           => $snmp,
+        macaddresses   => '.1.3.6.1.2.1.17.7.1.2.2.1.1', # dot1qTpFdbAddress
         address2port   => '.1.3.6.1.2.1.17.7.1.2.2.1.2', # dot1qTpFdbPort
+        macstatus      => '.1.3.6.1.2.1.17.7.1.2.2.1.3', # dot1qTpFdbStatus
         port2interface => '.1.3.6.1.2.1.17.1.4.1.2',     # dot1dBasePortIfIndex
     );
 
@@ -912,7 +916,9 @@ sub _setKnownMacAddresses {
             $snmp->switch_vlan_context($vlan);
             my $mac_addresses = _getKnownMacAddresses(
                 snmp           => $snmp,
+                macaddresses   => '.1.3.6.1.2.1.17.4.3.1.1', # dot1dTpFdbAddress
                 address2port   => '.1.3.6.1.2.1.17.4.3.1.2', # dot1dTpFdbPort
+                macstatus      => '.1.3.6.1.2.1.17.4.3.1.3', # dot1dTpFdbStatus
                 port2interface => '.1.3.6.1.2.1.17.1.4.1.2', # dot1dBasePortIfIndex
             );
             next unless $mac_addresses;
@@ -994,27 +1000,40 @@ sub _getKnownMacAddresses {
     my $snmp   = $params{snmp};
 
     my $results;
+    my $macaddresses   = $params{macaddresses} ? $snmp->walk($params{macaddresses}) : {};
     my $address2port   = $snmp->walk($params{address2port});
     my $port2interface = $snmp->walk($params{port2interface});
+    my $macstatus      = $params{macstatus} ? $snmp->walk($params{macstatus}) : {};
 
-    # dot1dTpFdbPort values matches the following scheme:
-    # $prefix.a.b.c.d.e.f = $port
+    # dot1dTpFdbAddress is the known mac addresses table
+    # dot1dTpFdbStatus is the mac addresses status table, only learned(3) ones should be kept
 
-    # dot1qTpFdbPort values matches the following scheme:
+    # dot1dTpFdbPort values may match one of the following scheme:
+    # $prefix.a.b.c.d.e.f = $port
     # $prefix.$vlan.a.b.c.d.e.f = $port
 
     # in both case, the last 6 elements of the OID constitutes
     # the mac address in decimal format
+
     foreach my $suffix (sort keys %{$address2port}) {
         my $port_id      = $address2port->{$suffix};
         my $interface_id = $port2interface->{$port_id};
         next unless defined $interface_id;
 
-        my @bytes = split(/\./, $suffix);
-        shift @bytes while @bytes > 6;
-
-        push @{$results->{$interface_id}},
-            sprintf "%02x:%02x:%02x:%02x:%02x:%02x", @bytes;
+        if ($macaddresses && $macaddresses->{$suffix}) {
+            my $mac = getCanonicalMacAddress($macaddresses->{$suffix});
+            next unless $mac;
+            # Assume mac status is learned(3) if not found
+            my $status = $macstatus && defined($macstatus->{$suffix}) && $macstatus->{$suffix} =~ /(\d+)/ ? int($1) : 3;
+            next unless $status == 3;
+            push @{$results->{$interface_id}}, $mac;
+        } else {
+            my @bytes = split(/\./, $suffix);
+            shift @bytes while @bytes > 6;
+            next unless @bytes == 6;
+            push @{$results->{$interface_id}},
+                sprintf "%02x:%02x:%02x:%02x:%02x:%02x", @bytes;
+        }
     }
 
     return $results;