From 8deae3ff79247d45efc01b78964cbea855863ac8 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil+github@lathwood.co.uk>
Date: Mon, 5 Jan 2015 21:06:49 +0000
Subject: [PATCH] Added Hikvision support

---
 html/images/os/hikvision.png            | Bin 0 -> 2674 bytes
 includes/definitions.inc.php            |   5 +++++
 includes/discovery/os/hikvision.inc.php |   9 +++++++++
 includes/functions.php                  |   4 ++++
 includes/polling/os/hikvision.inc.php   |   4 ++++
 5 files changed, 22 insertions(+)
 create mode 100644 html/images/os/hikvision.png
 create mode 100644 includes/discovery/os/hikvision.inc.php
 create mode 100644 includes/polling/os/hikvision.inc.php

diff --git a/html/images/os/hikvision.png b/html/images/os/hikvision.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffd68e961d6866094e5e0d4a2c5a339499a4e931
GIT binary patch
literal 2674
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
Wn8x?ASLglFN6;4KXvsA9i~Be2qt9Rf

literal 0
HcmV?d00001

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 50921ed57f..5288d526b1 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -938,6 +938,11 @@ $config['os'][$os]['group']             = "unix";
 $config['os'][$os]['type']              = "storage";
 $config['os'][$os]['icon']              = "synology";
 
+$os = "hikvision";
+$config['os'][$os]['text']              = "Hikvision";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['icon']              = "hikvision";
+
 foreach ($config['os'] as $this_os => $blah)
 {
   if (isset($config['os'][$this_os]['group']))
diff --git a/includes/discovery/os/hikvision.inc.php b/includes/discovery/os/hikvision.inc.php
new file mode 100644
index 0000000000..d5486cdf76
--- /dev/null
+++ b/includes/discovery/os/hikvision.inc.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!$os)
+{
+    if (preg_match("/Hikvision/", snmp_get($device, ".1.3.6.1.4.1.39165.1.6.0", "-Oqv", ""))) {
+      $os = "hikvision";
+    }
+}
+
diff --git a/includes/functions.php b/includes/functions.php
index 8dba210de9..90a807cbfe 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -451,6 +451,10 @@ function isSNMPable($device)
   global $config;
 
   $pos = snmp_get($device, "sysObjectID.0", "-Oqv", "SNMPv2-MIB");
+  if(empty($pos)) {
+     // Support for Hikvision
+     $pos = snmp_get($device, "SNMPv2-SMI::enterprises.39165.1.1.0", "-Oqv", "SNMPv2-MIB");
+  }
   if ($pos === '' || $pos === false)
   {
     return false;
diff --git a/includes/polling/os/hikvision.inc.php b/includes/polling/os/hikvision.inc.php
new file mode 100644
index 0000000000..d7cdde5eb5
--- /dev/null
+++ b/includes/polling/os/hikvision.inc.php
@@ -0,0 +1,4 @@
+<?php
+
+$version = trim(snmp_get($device, ".1.3.6.1.4.1.39165.1.3.0", "-OQv", "", ""),'"');
+$hardware = trim(snmp_get($device, ".1.3.6.1.4.1.39165.1.1.0", "-OQv", "", ""),'"');