From 5092c6d9acb8ab22cb61902c17c83d5f840d205b Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 15 Apr 2015 08:36:02 +0100
Subject: [PATCH] Updated the way cisco detection works

---
 includes/polling/os/cisco.inc.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/includes/polling/os/cisco.inc.php b/includes/polling/os/cisco.inc.php
index bed288e03..61d5dba52 100644
--- a/includes/polling/os/cisco.inc.php
+++ b/includes/polling/os/cisco.inc.php
@@ -1,14 +1,14 @@
 <?php
 
-if (preg_match('/^Cisco IOS Software, .+? Software \([^\-]+-([\w\d]+)-\w\), Version ([^,]+)/', $poll_device['sysDescr'], $regexp_result))
+if (preg_match('/^Cisco IOS Software, .+? Software(\, )?([\s\w\d]+)? \([^\-]+-([\w\d]+)-\w\), Version ([^,]+)/', $poll_device['sysDescr'], $regexp_result))
 {
-  $features = $regexp_result[1];
-  $version = $regexp_result[2];
-}
-elseif (preg_match('/^Cisco IOS Software, .+? Software([\,\w\d]*) \([^\-]+-([\w\d]+)-\w\), Version ([^,]+)/', $poll_device['sysDescr'], $regexp_result))
-{
-  $features = $regexp_result[2];
-  $version = $regexp_result[3];
+  $features = $regexp_result[3];
+  $version = $regexp_result[4];
+  $hardware = $regexp_result[2];
+  $tmp = preg_split("/\\r\\n|\\r|\\n/",$version);
+  if (!empty($tmp[0])) {
+      $version = $tmp[0];
+  }
 }
 
 echo("\n".$poll_device['sysDescr']."\n");
@@ -24,7 +24,7 @@ if ($data[1]['entPhysicalContainedIn'] == "0")
     $version = $data[1]['entPhysicalSoftwareRev'];
   }
 
-  if (!empty($data[1]['entPhysicalName']))
+  if (!empty($data[1]['entPhysicalName']) && $data[1]['entPhysicalName'] != 'Switch System')
   {
     $hardware = $data[1]['entPhysicalName'];
   }