From e56d26327ab19ee054e3689c66fb0be694b97c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Rosiak?= <sorenrosiak@gmail.com>
Date: Mon, 12 Dec 2016 16:25:20 +0200
Subject: [PATCH] refactor: More Cisco ASA Polling Performance Improvements
 (#5104)

---
 includes/polling/netstats/netstats-icmp.inc.php       | 2 +-
 includes/polling/netstats/netstats-ip.inc.php         | 2 +-
 includes/polling/netstats/netstats-ip_forward.inc.php | 2 +-
 includes/polling/netstats/netstats-tcp.inc.php        | 2 +-
 includes/polling/netstats/netstats-udp.inc.php        | 2 +-
 includes/polling/ports.inc.php                        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/polling/netstats/netstats-icmp.inc.php b/includes/polling/netstats/netstats-icmp.inc.php
index 2aba54991c..e3ee3ba1e5 100644
--- a/includes/polling/netstats/netstats-icmp.inc.php
+++ b/includes/polling/netstats/netstats-icmp.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] != 'Snom') {
+if (!starts_with($device['os'], array('Snom', 'asa'))) {
     echo ' ICMP';
 
     // Below have more oids, and are in trees by themselves, so we can snmpwalk_cache_oid them
diff --git a/includes/polling/netstats/netstats-ip.inc.php b/includes/polling/netstats/netstats-ip.inc.php
index 23e166c8b9..b53199e93d 100644
--- a/includes/polling/netstats/netstats-ip.inc.php
+++ b/includes/polling/netstats/netstats-ip.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] != 'Snom') {
+if (!starts_with($device['os'], array('Snom', 'asa'))) {
     echo ' IP';
 
     // These are at the start of large trees that we don't want to walk the entirety of, so we snmp_get_multi them
diff --git a/includes/polling/netstats/netstats-ip_forward.inc.php b/includes/polling/netstats/netstats-ip_forward.inc.php
index 077e8663ca..dec5a90085 100644
--- a/includes/polling/netstats/netstats-ip_forward.inc.php
+++ b/includes/polling/netstats/netstats-ip_forward.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] != 'Snom') {
+if (!starts_with($device['os'], array('Snom', 'asa'))) {
     echo ' IP-FORWARD';
 
     // Below have more oids, and are in trees by themselves, so we can snmpwalk_cache_oid them
diff --git a/includes/polling/netstats/netstats-tcp.inc.php b/includes/polling/netstats/netstats-tcp.inc.php
index 38470e46c3..6010188cde 100644
--- a/includes/polling/netstats/netstats-tcp.inc.php
+++ b/includes/polling/netstats/netstats-tcp.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] != 'Snom') {
+if (!starts_with($device['os'], array('Snom', 'asa'))) {
     echo ' TCP';
 
     $oids = array(
diff --git a/includes/polling/netstats/netstats-udp.inc.php b/includes/polling/netstats/netstats-udp.inc.php
index 9a6d222cf7..73fe7d7be2 100644
--- a/includes/polling/netstats/netstats-udp.inc.php
+++ b/includes/polling/netstats/netstats-udp.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] != 'Snom') {
+if (!starts_with($device['os'], array('Snom', 'asa'))) {
     echo ' UDP';
 
     // These are at the start of large trees that we don't want to walk the entirety of, so we snmpget_multi them
diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php
index fd12219a25..d87102f236 100644
--- a/includes/polling/ports.inc.php
+++ b/includes/polling/ports.inc.php
@@ -186,7 +186,7 @@ if ($config['enable_ports_poe']) {
 // foreach ($etherlike_oids as $oid) { $port_stats = snmpwalk_cache_oid($device, $oid, $port_stats, "EtherLike-MIB"); }
 // foreach ($cisco_oids as $oid)     { $port_stats = snmpwalk_cache_oid($device, $oid, $port_stats, "OLD-CISCO-INTERFACES-MIB"); }
 // foreach ($pagp_oids as $oid)      { $port_stats = snmpwalk_cache_oid($device, $oid, $port_stats, "CISCO-PAGP-MIB"); }
-if ($device['os_group'] == 'cisco') {
+if ($device['os_group'] == 'cisco' && $device['os'] != 'asa') {
     $port_stats = snmp_cache_portIfIndex($device, $port_stats);
     $port_stats = snmp_cache_portName($device, $port_stats);
     foreach ($pagp_oids as $oid) {