From fd5c8fe8002196202e6533744cafdc1bc48e98ea Mon Sep 17 00:00:00 2001
From: Aaron Daniels <aaron@daniels.id.au>
Date: Thu, 30 Jun 2016 07:11:17 +1000
Subject: [PATCH 1/2] - OS support for Cisco/Tandberg Video Conferencing
 Endpoints

---
 includes/definitions.inc.php          | 5 +++++
 includes/discovery/os/vccodec.inc.php | 7 +++++++
 includes/polling/os/vccodec.inc.php   | 8 ++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 includes/discovery/os/vccodec.inc.php
 create mode 100644 includes/polling/os/vccodec.inc.php

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 86eea6a54a..db3ea16179 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -598,6 +598,11 @@ $config['os'][$os]['over'][2]['graph'] = 'device_mempool';
 $config['os'][$os]['over'][2]['text']  = 'Memory Usage';
 $config['os'][$os]['icon']             = 'cisco';
 
+$os = 'vccodec';
+$config['os'][$os]['text']             = 'TelePresence Codec';
+$config['os'][$os]['type']             = 'collaboration';
+$config['os'][$os]['icon']             = 'cisco';
+
 // Brocade NOS
 $os = 'nos';
 $config['os'][$os]['text']             = 'Brocade NOS';
diff --git a/includes/discovery/os/vccodec.inc.php b/includes/discovery/os/vccodec.inc.php
new file mode 100644
index 0000000000..f233fb46eb
--- /dev/null
+++ b/includes/discovery/os/vccodec.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+if (!$os) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.5596.150.6.4.1')) {
+        $os = 'vccodec';
+    }
+}
diff --git a/includes/polling/os/vccodec.inc.php b/includes/polling/os/vccodec.inc.php
new file mode 100644
index 0000000000..fe3a9fcd8f
--- /dev/null
+++ b/includes/polling/os/vccodec.inc.php
@@ -0,0 +1,8 @@
+<?php
+
+// Cisco CodecSoftW: ce8.1.0.b8c0ca3MCU: Cisco TelePresence SX20Date: 2016-04-05S/N: 0101010101
+if (preg_match('/^Cisco CodecSoftW: ([^,]+)MCU: Cisco TelePresence ([^,]+)Date: [^,]+S\/N: ([^,]+)$/', $device['sysDescr'], $regexp_result)) {
+    $version  = $regexp_result[1];
+    $hardware = $regexp_result[2];
+    $serial = $regexp_result[3];
+}

From 4cfa3910e96ac789acd7ff8f333f96de5d283096 Mon Sep 17 00:00:00 2001
From: Aaron Daniels <aaron@daniels.id.au>
Date: Wed, 17 Aug 2016 08:52:52 +1000
Subject: [PATCH 2/2] - some models have a space, fix regex

---
 includes/polling/os/vccodec.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/polling/os/vccodec.inc.php b/includes/polling/os/vccodec.inc.php
index fe3a9fcd8f..a6c3512bb7 100644
--- a/includes/polling/os/vccodec.inc.php
+++ b/includes/polling/os/vccodec.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // Cisco CodecSoftW: ce8.1.0.b8c0ca3MCU: Cisco TelePresence SX20Date: 2016-04-05S/N: 0101010101
-if (preg_match('/^Cisco CodecSoftW: ([^,]+)MCU: Cisco TelePresence ([^,]+)Date: [^,]+S\/N: ([^,]+)$/', $device['sysDescr'], $regexp_result)) {
+if (preg_match('/^Cisco Codec\s?SoftW: ([^,]+)\s?MCU: Cisco TelePresence ([^,]+)\s?Date: [^,]+\s?S\/N: ([^,]+)$/', $device['sysDescr'], $regexp_result)) {
     $version  = $regexp_result[1];
     $hardware = $regexp_result[2];
     $serial = $regexp_result[3];