From bb5207c62449e77fc5a1513a5d79129a3612c876 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Sat, 17 Jul 2010 19:20:00 +0000
Subject: [PATCH] more os support

git-svn-id: http://www.observium.org/svn/observer/trunk@1388 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/images/os/d-link.png                 | Bin 1261 -> 0 bytes
 html/images/os/drac.png                   | Bin 1777 -> 0 bytes
 html/images/os/novell.png                 | Bin 0 -> 375 bytes
 includes/osdiscovery/discover-ies.php     |   2 +-
 includes/osdiscovery/discover-netware.php |   9 +++++++++
 includes/osdiscovery/discover-zyxeles.php |   9 +++++++++
 includes/static-config.php                |   9 ++++++++-
 7 files changed, 27 insertions(+), 2 deletions(-)
 delete mode 100644 html/images/os/d-link.png
 delete mode 100644 html/images/os/drac.png
 create mode 100644 html/images/os/novell.png
 create mode 100644 includes/osdiscovery/discover-netware.php
 create mode 100644 includes/osdiscovery/discover-zyxeles.php

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

literal 1261
zcmV<J1QPp+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O`
zVN5~y0000WV@Og>004&&004{<008|>004nL003F*009yY002DZ000@zy2&Ck0003a
zX+uL$Nkc;*P;zf(X>4Tx04UF6U|=$Eba8TJ5@2A+%_}Jia(7aQh>TKTKhMC%z{~&!
ziOIzUjsXEaAa-7UUMd4BU}RwUb`3-_FkIFJnZ-aF;7TqiDgn}efY>M{wKy4Qqydnf
zU0zZE6la_RWQ!zagV`HE?4pn$XCV6skj<A4VP65UlOXITAa)VZ6F~MCkot5mn~4K#
z4umZOVwa>=fb3;(&M&Ae%1qBFQ82W$v{Z0R$xljE2(BzHNzE-*@XSljFDl3{N-RlD
z0jh<#4-5n$3PB;J0n})r$v|ZQiU$bmb09c;8O6>Z#1J64w5SXg7fi;4`3N)SNH8$?
zFJ)k0`GXKM>1AM8pu@nxKNTUSX2`%GpwGatZw>&$vrqo3{?2~@000SaNLh0L04^f{
z04^f|c%?sf00007bV*G`2h|4@4=N&3EAbTo000?uMObuGZ)S9NVRB^vP+@6qbS_Rs
zR3LUUE;TMSNs9d70008~Nkl<ZSV!%Y&r4KM6vszr-ppwEBT20!(uzSOG3|$GL<Uje
z#ulMO2)+AeoT9Qq7e&zzquP|s-229|l5n9BM6{@Xpk)P75Y;Z%LC}vy23emwbDs^R
zYd3G;aL@UkbI<v{@4a^d0srSK;49!O;484u3IuJ{Utp`po)y~a5!j)8ULjj;ApgL#
zkWj5UAF}0c>c3)R^L<CuktMnxH4m{audXbaE-&kIcLjnX-9qEv+KS>T#`;<N4B6`y
zTSAty`KiVWZ8;jTuZMIFYy^7~67pCikq$$s*%Iz);$`6dL812H*RXytGkWP&9kgXj
zSje`rq+A{-5OR%2pz++O1=~Rrzb#J=7ZR_cSuNOP4wpk7F&g!gdxpJ&@IkZh7xAYY
zS@k`ulyIM$_&C@U{xtPH**^agh{jV(D3~!STs0eCu-^ZVfKc6L=xf$`<NrjZrtCi9
z{>mo+_Qmu~%pTbs3Y;}V-&Y>FSz38?v})<$OcZRwBT$l%QHG$1?3#nX53q)L2uy1n
z<ubDbIHPUe5k%u^3le=ZEW5p;MM7HOPs|-~k#9f#ls;p#_Z>1f8h@JFbvXiRrXrCF
zQuopfK11%K@voGK8<xIE%6#1fzP52T<j%+Z7}#raUJa|f#{C%5dv%VQlU^S_suS$4
z#w~EYnmU(@8q=>v$JF%%!j9_XX4dIhVUcbxPGo8<M>a=9dTl-l8f^xTY0R=^ZGJ9j
zr>l6XD?E%FzU%J`QY#~lJNx{ybL><EBK6rCn4b<i?pQeP9<UsBk>U$MAqP08JCGZI
z<#>^kst5~}qBaw8)G0P!4m<KT#4`*VAil&pgk7RXDGJ`D{yceZy=;rd-9h3>>;(O8
zX`C6u^g0$`;0}OxHg^;!+$Q`^{1!-UFYX(O5#L*s$Sf|3yLB{g(>buM{K0hKuczTg
zY8xVsY$e{A{ld6vqP7EkHEVTQa-`G}={@AzsZX+QqKA%~^Of{{UjbhMUjbi%1ySG+
XlE0GkQt$US00000NkvXXu0mjfkxn0$

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

literal 1777
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
TlzL0z00000NkvXXu0mjf`gv4w

diff --git a/html/images/os/novell.png b/html/images/os/novell.png
new file mode 100644
index 0000000000000000000000000000000000000000..14c483042eda792199d940fe15abf1c3198664c1
GIT binary patch
literal 375
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Y)RhkE)4%c
zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^kiEpy*OmPiyPz;5YtYk$Pk=(-JzX3_A`b7p
zwwLRWfdKo5(_6*XG#xEBUOc(~$%`iv_kG_awBC|h&LgTA|NXr0LV;h(<vY7KU7OS$
zSz4R>%eL{b+?zMovN&&?adFuyDYbIG?=IQ;{h{9?cbc~6Ik6r;(aq$gXrbEf%9z3O
zJft{~f$N~q_gxweQU_N`FBO=xx$@H6AD8Y5a(y`4D%v|;#^nNMi-OwT-Oj-e=1+K^
z>lN#A)#1d9K35m<g(gZb#jd1f+`BSIMd0N1f?T=l{40y~9=)H;Gq)T_1d31a(`Xc6
zUZUi}sL4_2pu@z};dp>yA%}(n3nTjvfo{JQd8?e9VvdWvZ?RPW$m(NTUSMVO`UWrv
O7(8A5T-G@yGywo!Opdew

literal 0
HcmV?d00001

diff --git a/includes/osdiscovery/discover-ies.php b/includes/osdiscovery/discover-ies.php
index a5e9b08f01..de24b56a4f 100644
--- a/includes/osdiscovery/discover-ies.php
+++ b/includes/osdiscovery/discover-ies.php
@@ -2,7 +2,7 @@
 
 if(!$os) {
 
-  if(strpos($sysDescr, "ZyXEL IES-") !== FALSE) { $os = "ies"; }
+  if(strpos($sysDescr, "IES-") !== FALSE) { $os = "ies"; }
 
 }
 
diff --git a/includes/osdiscovery/discover-netware.php b/includes/osdiscovery/discover-netware.php
new file mode 100644
index 0000000000..b7abfc1182
--- /dev/null
+++ b/includes/osdiscovery/discover-netware.php
@@ -0,0 +1,9 @@
+<?php
+
+if(!$os) {
+
+  if(strstr($sysDescr, "Novell NetWare")) { $os = "netware"; }
+
+}
+
+?>
diff --git a/includes/osdiscovery/discover-zyxeles.php b/includes/osdiscovery/discover-zyxeles.php
new file mode 100644
index 0000000000..24d99a3b41
--- /dev/null
+++ b/includes/osdiscovery/discover-zyxeles.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!$os) {
+
+  if (preg_match("/^ES-/", $sysDescr)) { $os = "zyxeles"; }
+
+}
+
+?>
diff --git a/includes/static-config.php b/includes/static-config.php
index 5019c54277..91cdffd124 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -27,6 +27,9 @@ $config['os']['netbsd']['text']  	= "NetBSD";
 $config['os']['dragonfly']['group'] 	= "unix";
 $config['os']['dragonfly']['text']  	= "DragonflyBSD";
 
+$config['os']['netware']['text']  	= "Novell Netware";
+$config['os']['netware']['icon']  	= "novell";
+
 $config['os']['monowall']['group'] 	= "unix";
 $config['os']['monowall']['text']  	= "m0n0wall";
 $config['os']['monowall']['type']  	= "firewall";
@@ -120,7 +123,7 @@ $config['os']['dlink']['icon']          = "dlink";
 
 $config['os']['dlinkap']['text']        = "D-Link Access Point";
 $config['os']['dlinkap']['type']        = "network";
-$config['os']['dlink']['icon']          = "dlink";
+$config['os']['dlinkap']['icon']        = "dlink";
 
 $config['os']['axiscam']['text']        = "AXIS Network Camera";
 
@@ -157,6 +160,10 @@ $config['os']['prestige']['text']     	= "ZyXEL Prestige";
 $config['os']['prestige']['type']     	= "network";
 $config['os']['prestige']['icon']       = "zyxel";
 
+$config['os']['zyxeles']['text']     	= "ZyXEL Ethernet Switch";
+$config['os']['zyxeles']['type']     	= "network";
+$config['os']['zyxeles']['icon']        = "zyxel";
+
 $config['os']['ies']['text']     	= "ZyXEL IES DSLAM";
 $config['os']['ies']['type']     	= "network";
 $config['os']['ies']['icon']            = "zyxel";