From 2f218e315fcec8893a2fcebc3a18781daee7bb93 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Tue, 26 Jul 2016 09:49:59 -0500
Subject: [PATCH] Correct missing/extra data issues netstats-icmp missing data
 netstats-tcp extra data

---
 includes/polling/netstats-icmp.inc.php | 6 ++++--
 includes/polling/netstats-tcp.inc.php  | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/includes/polling/netstats-icmp.inc.php b/includes/polling/netstats-icmp.inc.php
index 5e77ecc927..d18d4e53fe 100644
--- a/includes/polling/netstats-icmp.inc.php
+++ b/includes/polling/netstats-icmp.inc.php
@@ -34,13 +34,15 @@ if ($device['os'] != 'Snom') {
     );
 
     $data = snmpwalk_cache_oid($device, 'icmp', array(), 'IP-MIB');
-    $fields = $data[0];
+    $data = $data[0];
 
-    if (isset($fields['icmpInMsgs']) && isset($fields['icmpOutMsgs'])) {
+    if (isset($data['icmpInMsgs']) && isset($data['icmpOutMsgs'])) {
         $rrd_def = array();
+        $fields = array();
         foreach ($oids as $oid) {
             $oid_ds    = truncate($oid, 19, '');
             $rrd_def[] = "DS:$oid_ds:COUNTER:600:U:100000000000";
+            $fields[$oid] = isset($data[$oid]) ? $data[$oid] : 'U';
         }
 
         $tags = compact('rrd_def');
diff --git a/includes/polling/netstats-tcp.inc.php b/includes/polling/netstats-tcp.inc.php
index 256ce11988..383e15cdcb 100644
--- a/includes/polling/netstats-tcp.inc.php
+++ b/includes/polling/netstats-tcp.inc.php
@@ -31,9 +31,11 @@ if ($device['os'] != 'Snom') {
     $fields = $data[0];
 
     // use HC Segs if we have them.
-    if (isset($fields['tcpHCInSegs']) && !empty($fields['tcpHCInSegs'])) {
-        $fields['tcpInSegs'] = $fields['tcpHCInSegs'];
-        $fields['tcpOutSegs'] = $fields['tcpHCOutSegs'];
+    if (isset($fields['tcpHCInSegs'])) {
+        if (!empty($fields['tcpHCInSegs'])) {
+            $fields['tcpInSegs'] = $fields['tcpHCInSegs'];
+            $fields['tcpOutSegs'] = $fields['tcpHCOutSegs'];
+        }
         unset($fields['tcpHCInSegs'], $fields['tcpHCOutSegs']);
     }