From b9c4132967c6728ecce8c639f44a07cb9aaa9bbc Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Thu, 13 Oct 2016 11:57:12 -0500 Subject: [PATCH] fix: Samsun ML typo, remove need for hex_string translation (#4788) --- includes/discovery/toner.inc.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/includes/discovery/toner.inc.php b/includes/discovery/toner.inc.php index 0008a8bfc0..1418653d06 100644 --- a/includes/discovery/toner.inc.php +++ b/includes/discovery/toner.inc.php @@ -16,7 +16,7 @@ if ($device['os_group'] == 'printer') { //samsung ml series does not responde to snmpwalk if ($os == 'samsungprinter' && str_contains($device['sysDescr'], 'Samsung ML')) { - $toner_oid = '.1.3.6.1.2.1.43.12.1.1.4.1.1'; + $toner_oid = '.1.3.6.1.2.1.43.11.1.1.9.1.1'; $descr_oid = '.1.3.6.1.2.1.43.11.1.1.6.1.1'; $capacity_oid = '.1.3.6.1.2.1.43.11.1.1.8.1.1'; $descr = trim(str_replace("\n", '', preg_replace('/[^ \w]+/', '', snmp_get($device, $descr_oid, '-Oqv')))); @@ -45,7 +45,7 @@ if ($device['os_group'] == 'printer') { $capacity_oid = ".1.3.6.1.2.1.43.11.1.1.8.1.$index"; } - $descr = trim(str_replace("\n", '', preg_replace('/[^ \w]+/', '', snmp_get($device, $descr_oid, '-Oqv')))); + $descr = trim(str_replace("\n", '', preg_replace('/[^ \w]+/', '', snmp_get($device, $descr_oid, '-Oqva')))); if ($descr != '') { $oid_toner = snmp_get($device, $toner_oid, '-Oqv'); @@ -55,9 +55,6 @@ if ($device['os_group'] == 'printer') { $current = get_toner_levels($device, $oid_toner, $oid_capacity); $type = 'jetdirect'; - if (isHexString($descr)) { - $descr = preg_replace('/[^ \w]+/', '', snmp_hexstring($descr)); - } discover_toner($valid_toner, $device, $toner_oid, $index, $type, $descr, $capacity_oid, $capacity, $current); }