From 75da0430617f3618f28da63aabae2ebcd0f73903 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Wed, 21 Jul 2010 00:30:37 +0000
Subject: [PATCH] detect more speedtouch, basic detection of huawei vrp os

git-svn-id: http://www.observium.org/svn/observer/trunk@1451 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/images/os/huawei.png                | Bin 0 -> 2064 bytes
 includes/discovery/os/ios.inc.php        |   5 +++--
 includes/discovery/os/speedtouch.inc.php |   2 +-
 includes/discovery/os/vrp.inc.php        |  10 ++++++++++
 includes/static-config.php               |   5 +++++
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 html/images/os/huawei.png
 create mode 100644 includes/discovery/os/vrp.inc.php

diff --git a/html/images/os/huawei.png b/html/images/os/huawei.png
new file mode 100644
index 0000000000000000000000000000000000000000..a69dd8eae6f5529ff3f265dd8cbf377b7b8cfa63
GIT binary patch
literal 2064
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

literal 0
HcmV?d00001

diff --git a/includes/discovery/os/ios.inc.php b/includes/discovery/os/ios.inc.php
index 9db9bd29cc..70c969bf6d 100755
--- a/includes/discovery/os/ios.inc.php
+++ b/includes/discovery/os/ios.inc.php
@@ -3,8 +3,9 @@
 if(!$os) {
 
   if(strstr($sysDescr, "Cisco Internetwork Operating System Software")) { $os = "ios"; }
-  if(strstr($sysDescr, "IOS (tm)")) { $os = "ios"; }
-  if(strstr($sysDescr, "Cisco IOS Software")) { $os = "ios"; }
+  else if(strstr($sysDescr, "IOS (tm)")) { $os = "ios"; }
+  else if(strstr($sysDescr, "Cisco IOS Software")) { $os = "ios"; }
+  
   if(strstr($sysDescr, "IOS-XE")) { $os = "iosxe"; }
   if(strstr($sysDescr, "IOS XR")) { $os = "iosxr"; }
 
diff --git a/includes/discovery/os/speedtouch.inc.php b/includes/discovery/os/speedtouch.inc.php
index 443a17dd7a..8983d73dad 100755
--- a/includes/discovery/os/speedtouch.inc.php
+++ b/includes/discovery/os/speedtouch.inc.php
@@ -3,7 +3,7 @@
 if(!$os) {
 
   if(strpos($sysDescr, "TG585v7") !== FALSE) { $os = "speedtouch"; }
-  else if(strpos($sysDescr, "SpeedTouch 5") !== FALSE) { $os = "speedtouch"; }
+  else if(strpos($sysDescr, "SpeedTouch ") !== FALSE) { $os = "speedtouch"; }
   else if (preg_match("/^ST\d/", $sysDescr)) { $os = "speedtouch"; }
 
 }
diff --git a/includes/discovery/os/vrp.inc.php b/includes/discovery/os/vrp.inc.php
new file mode 100644
index 0000000000..fee80b4def
--- /dev/null
+++ b/includes/discovery/os/vrp.inc.php
@@ -0,0 +1,10 @@
+<?php
+
+if(!$os) {
+
+  if(strstr($sysDescr, "VRP (R) Software")) { $os = "vrp"; }
+  else if(strstr($sysDescr, "VRP Software Version")) { $os = "vrp"; }
+
+}
+
+?>
diff --git a/includes/static-config.php b/includes/static-config.php
index 96c9e866c1..905fd08ab4 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -86,6 +86,11 @@ $config['os']['catos']['text']		= "Cisco CatOS";
 $config['os']['catos']['ifname']	= 1;
 $config['os']['catos']['type']		= "network";
 
+$config['os']['vrp']['group'] 		= "vrp";
+$config['os']['vrp']['text']  		= "Huawei VRP";
+$config['os']['vrp']['type']  		= "network";
+$config['os']['vrp']['icon']  		= "huawei";
+
 $config['os']['junos']['text']		= "Juniper JunOS";
 $config['os']['junos']['type']		= "network";