From 534595d71d5ca5ef4dcf98540754a8e3ce90e021 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Mon, 17 Jul 2017 13:00:48 +0100
Subject: [PATCH] newdevice: Added detection for Gestetner printers (#7038)

* newdevice: Added detection for Gestetner printers

* added missing snmprec test file

* reverted ports change from debug
---
 html/images/os/ricoh.png              | Bin 1087 -> 0 bytes
 html/images/os/ricoh.svg              |   1 +
 includes/definitions/gestetner.yaml   |  16 ++++++++++++++++
 includes/polling/os/gestetner.inc.php |  10 ++++++++++
 tests/snmpsim/gestetner.snmprec       |   3 +++
 5 files changed, 30 insertions(+)
 delete mode 100644 html/images/os/ricoh.png
 create mode 100644 html/images/os/ricoh.svg
 create mode 100644 includes/definitions/gestetner.yaml
 create mode 100644 includes/polling/os/gestetner.inc.php
 create mode 100644 tests/snmpsim/gestetner.snmprec

diff --git a/html/images/os/ricoh.png b/html/images/os/ricoh.png
deleted file mode 100644
index ff2a45b7ed2831f66d2d8acc943d3a155c50986d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1087
zcmV-F1i<@=P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY{
z5HL9tn5+W;00X~CL_t(o!^M}&ZyQw<#(#J08GGXT(KxDQr6nY3N~^RaqNyT`#2dr{
zSg@*4ca@4%b%PN90DFWg0aB2Vx~tg04ha<0Rl`G}kSY;Ls-}(7kcZ{OjvwRK%w=Kc
zVSDVv57Z;w#mqVP&Nt`#&OP@EDJ4(Sob?<_V&rxnv)|6Qjdt@zdGGduxaw7z{w9yv
ze+;JqkVmdNaLy)i-8nC(rdkFNz>0V&K4a(m7uP^-T=76ejwqSvj2QiFME?C{BLGT0
zhlNNxamngo7gzd|-59rY;*w#so?gt)XGJ8^5`cXZRpT&|d$E2BS{KHLZ31XTq;hXw
zp2FCIxaw^Kz){UULp><I4p7icCMrQ>Q8u2F-zJ-`g2NU*YOIN4vZXS#7nZb1q4boh
zqtaI-ClYA?<OtkqlY;uT#b57w5aH?%$FK?yasEC{>hc-+%W4Ozpf>$~ikAlaFm7rH
z=dM4GEUut`wT|~S!T4M6$ff&-t$sui${KDx=y7*>``tAS;na}BNwR&7gx3ZI`#hhO
zld(9;RFPaodO~Dh9inh+MvUI*5CB=X0+NWk)xey%q@RM;i*<cbywTgC3`pAwaL{!x
zfts)0h{{zl7-Re84pJa&YPf3w#KUSD0Q?lR5a#<G0$@+USveWoLCjQUX+H}-<jA~u
zGuS~9iUvBUH7}fg%=Xy-wh`6ppt3P3<kd4+@3jn|l3RNr+UuYcTcW{yy%7ycv-RIt
z2bHl!a>7skTq7FlHlr-cMjp}Q#xg433q6jR=&RB}5;X!=)ha4kiuySi1Ab}>K!)Iz
zBw4qe&x0O6`2023CqCi39~zu5v-OiJWlQ546Kbn-4-Qf9VlpE}Z)8wn`;A8bV~+Im
z!+7pTS@ZY_3@=h#9p}W{&qTwQa9l_rwgw2y{z`OEpzH~6oQsq7np0g0PGNqUfh7Pp
zX5>e#%MvRVC3_l<Gf&FnKo4%S^|l|m`T#3Cgwnl4{5)U`p}6Nsd%_%Bkt}OXi*Wb6
z53qysy@9z>e$-3#ug6Z{$Rr>WA{F1n7kq$~m1WU-aW97v-jleJZEZv;ihAj;qf`jV
z#0ajDI^{=pFXFA1KTpVcH!-`~>IHe^x`sOK!}{P7jthNgd%V7Y?slNZ5{NB7vU>={
zZDIsNsCo!h_anPajNlV;-j)uf)2JVx#Ffk;Ha0NsCWy~1<I!Fr^eBxH_>G+yKtC53
z26*hd!)69Fp5^$XG)5rGnkQVo%6`E|I}`P~%hSG|{|Dzn%{qQk8;$?~002ovPDHLk
FV1n)__YwdA

diff --git a/html/images/os/ricoh.svg b/html/images/os/ricoh.svg
new file mode 100644
index 0000000000..f4185c5dc6
--- /dev/null
+++ b/html/images/os/ricoh.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1" viewBox="0 0 200 36.093"><g fill="#d7063b"><path d="M78.927 17.952c0 6.68 4.95 11.612 13.215 11.612 3.486 0 6.78-.55 10.183-2.14l3.09 4.226c-4.276 2.262-8.393 3.443-14.72 3.443-13.19 0-22.888-6.35-22.888-17.14v-.003c0-10.784 9.7-17.14 22.89-17.14 6.325 0 9.96.928 14.418 2.838l-3.175 4.856c-3.37-1.796-6.312-2.163-9.798-2.163-8.264 0-13.215 4.92-13.215 11.604M129.26.805c-12.772 0-21.984 6.357-21.984 17.144 0 10.79 9.212 17.142 21.984 17.142 12.77 0 21.98-6.35 21.98-17.143 0-10.788-9.21-17.145-21.98-17.145m0 28.954c-7.028 0-10.907-5.28-10.907-11.816 0-6.536 3.88-11.81 10.907-11.81 7.023 0 10.903 5.274 10.903 11.81 0 6.535-3.88 11.815-10.903 11.815M184.446 20.43v13.797H195V1.67h-10.554v12.408h-16.133V1.668H157.78v32.56h10.533v-13.8h16.133zM50.328 34.227h11.116V1.67H50.328v32.557zM18.45 16.57l-.004 3.115c5.23 4.04 10.557 9.415 14.464 14.542h12.44C41.02 29.143 34.383 23.1 29.492 20.06c5.74-.24 12.143-2.562 12.143-9.15 0-8.462-9.04-10.005-18.176-10.005-7.465 0-14.346.34-18.46.68v32.642h10.366V6.495c1.92-.205 3.983-.433 8.143-.433 5.34 0 8.044 1.762 8.044 4.847 0 2.626-1.12 5.774-13.105 5.66"/></g></svg>
diff --git a/includes/definitions/gestetner.yaml b/includes/definitions/gestetner.yaml
new file mode 100644
index 0000000000..f85016b68f
--- /dev/null
+++ b/includes/definitions/gestetner.yaml
@@ -0,0 +1,16 @@
+os: gestetner
+group: printer
+text: 'Gestetner Printer'
+type: printer
+icon: ricoh
+over:
+    - { graph: device_toner, text: Toner }
+discovery:
+    - sysDescr:
+        - Gestetner Network Printer
+discovery_modules:
+    toner: 1
+    mempools: 0
+poller_modules:
+    toner: 1
+    mempools: 0
\ No newline at end of file
diff --git a/includes/polling/os/gestetner.inc.php b/includes/polling/os/gestetner.inc.php
new file mode 100644
index 0000000000..10172afcb6
--- /dev/null
+++ b/includes/polling/os/gestetner.inc.php
@@ -0,0 +1,10 @@
+<?php
+
+// SNMPv2-SMI::enterprises.367.3.2.1.1.1.1.0 = STRING: "Aficio MP 3350"
+$hardware = trim(snmp_get($device, '1.3.6.1.4.1.367.3.2.1.1.1.1.0', '-OQv', '', ''), '" ');
+
+// SNMPv2-SMI::enterprises.367.3.2.1.1.1.2.0 = STRING: "1.15"
+$version = trim(snmp_get($device, '1.3.6.1.4.1.367.3.2.1.1.1.2.0', '-OQv', '', ''), '" ');
+
+// SNMPv2-SMI::enterprises.367.3.2.1.2.1.4.0 = STRING: "M6394300657"
+$serial = trim(snmp_get($device, '1.3.6.1.4.1.367.3.2.1.2.1.4.0', '-OQv', '', ''), '" ');
diff --git a/tests/snmpsim/gestetner.snmprec b/tests/snmpsim/gestetner.snmprec
new file mode 100644
index 0000000000..7baa349be7
--- /dev/null
+++ b/tests/snmpsim/gestetner.snmprec
@@ -0,0 +1,3 @@
+1.3.6.1.2.1.1.1.0|4|Gestetner MPC2500/DSc525 1.71 / Gestetner Network Printer C model / Gestetner Network Scanner C model
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.367.1.1
+