fix: Update HP LaserJet Pro MFP printer series support

glpi-project · Mar 25, 2022 · 9418c6e · 9418c6e
1 parent e5db90b
commit 9418c6e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/Changes b/Changes
@@ -28,6 +28,7 @@ netdiscovery/netinventory:
 * Fix: don't rescan config on each thread but share parent config to avoid threading
   crash on win32
 * Enhance Qnap storage inventory
+* Update HP LaserJet Pro MFP printer series support
 
 deploy:
 * fix: Fix UserInteraction messages encoding failure as perl 5.34 regression

diff --git a/lib/GLPI/Agent/SNMP/MibSupport/HPNetPeripheral.pm b/lib/GLPI/Agent/SNMP/MibSupport/HPNetPeripheral.pm
@@ -30,6 +30,9 @@ use constant    totalEnginePageCount => statusPrtEngine . '.5.0' ;
 use constant    totalColorPageCount  => statusPrtEngine . '.7.0' ;
 use constant    duplexPageCount      => statusPrtEngine . '.22.0' ;
 
+# HP LaserJet Pro MFP / Marvel ASIC
+use constant    hpLaserjetProMFP => '.1.3.6.1.4.1.26696.1' ;
+
 my %counters = (
     TOTAL   => totalEnginePageCount,
     COLOR   => totalColorPageCount,
@@ -48,9 +51,24 @@ our $mibSupport = [
     {
         name        => "hp-system",
         sysobjectid => getRegexpOidMatch(hpSystem)
+    },
+    {
+        name        => "hp-laserjet-pro-mfp",
+        sysobjectid => getRegexpOidMatch(hpLaserjetProMFP)
     }
 ];
 
+sub getManufacturer {
+    my ($self) = @_;
+
+    my $device = $self->device
+        or return;
+
+    return if $device->{MANUFACTURER};
+
+    return "Hewlett-Packard";
+}
+
 sub getFirmware {
     my ($self) = @_;