don't discover ports that shouldn't be discovered!

git-svn-id: http://www.observium.org/svn/observer/trunk@2347 61d68cd4-352d-0410-923a-c4978735b2b8

includes/discovery/ports.inc.php

@@ -4,53 +4,26 @@
 
 echo("Ports : ");
 
-$ports = snmp_walk($device, "ifDescr", "-Onsq", "IF-MIB");
 
-$ports = str_replace("\"", "", $ports);
+$ports = array();
-$ports = str_replace("ifDescr.", "", $ports);
+$ports = snmpwalk_cache_oid($device, "ifDescr", $port_stats, "IF-MIB");
-#$ports = str_replace(" ", "||", $ports);
+#$ports = snmpwalk_cache_oid($device, "ifName", $port_stats, "IF-MIB");
+#$ports = snmpwalk_cache_oid($device, "ifType", $port_stats, "IF-MIB");
 
 $interface_ignored = 0;
 $interface_added   = 0;
 
-foreach (explode("\n", $ports) as $entry)
+foreach ($ports as $ifIndex => $port)
 {
-  $entry = trim($entry);
-  list($ifIndex, $ifDescr) = explode(" ", $entry, 2);
-  if (!strstr($entry, "irtual"))
-  {
-    $if = trim(strtolower($ifDescr));
-    $nullintf = 0;
-    foreach ($config['bad_if'] as $bi)
-    {
-      if (strstr($if, $bi))
-      {
-        $nullintf = 1;
-        if($debug) { echo("ignored : $bi : $if"); }
-      }
-    }
-    if (is_array($config['bad_if_regexp']))
-    {
-      foreach ($config['bad_if_regexp'] as $bi)
-      {
-        if (preg_match($bi ."i", $if))
-        {
-          $nullintf = 1;
-          if($debug) { echo("ignored : $bi : $if"); }
-        }
-      }
-    }
 
-    if (empty($ifDescr)) { $nullintf = 1; }
+  if (is_port_valid($port, $device))
-    if ($device['os'] == "catos" && strstr($if, "vlan")) { $nullintf = 1; }
-    if ($device['os'] == "vmware" && preg_match("/Device ([a-z0-9]+) at .*/", $ifDescr, $matches)) { $ifDescr = $matches[1]; }
-    $ifDescr = fixifName($ifDescr);
-    if ($debug) echo("\n $if ");
-    if ($nullintf == 0)
   {
+    if ($device['os'] == "vmware" && preg_match("/Device ([a-z0-9]+) at .*/", $port['ifDescr'], $matches)) { $port['ifDescr'] = $matches[1]; }
+    $port['ifDescr'] = fixifName($port['ifDescr']);
+    if ($debug) echo("\n $if ");
     if (mysql_result(mysql_query("SELECT COUNT(*) FROM `ports` WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex'"), 0) == '0')
     {
-        mysql_query("INSERT INTO `ports` (`device_id`,`ifIndex`,`ifDescr`) VALUES ('".$device['device_id']."','$ifIndex','".mres($ifDescr)."')");
+      mysql_query("INSERT INTO `ports` (`device_id`,`ifIndex`,`ifDescr`) VALUES ('".$device['device_id']."','$ifIndex','".mres($port['ifDescr'])."')");
       # Add Interface
       echo("+");
     } else {
@@ -70,7 +43,6 @@ foreach (explode("\n", $ports) as $entry)
     }
   }
 }
-}
 
 $sql = "SELECT * FROM `ports` WHERE `device_id`  = '".$device['device_id']."' AND `deleted` = '0'";
 $query = mysql_query($sql);

includes/functions.php

@@ -582,4 +582,42 @@ function include_dir($dir, $regex = "")
   }
 }
 
+function is_port_valid($port, $device)
+{
+
+  global $config;
+
+  if (!strstr($port['ifDescr'], "irtual"))
+  {
+    $valid = 1;
+    $if = strtolower($port['ifDescr']);
+    foreach ($config['bad_if'] as $bi)
+    {
+      if (strstr($if, $bi))
+      {
+        $valid = 0;
+        if($debug) { echo("ignored : $bi : $if"); }
+      }
+    }
+    if (is_array($config['bad_if_regexp']))
+    {
+      foreach ($config['bad_if_regexp'] as $bi)
+      {
+        if (preg_match($bi ."i", $if))
+        {
+          $valid = 0;
+          if($debug) { echo("ignored : $bi : ".$if); }
+        }
+      }
+    }
+    if (empty($port['ifDescr'])) { $valid = 0; }
+    if ($device['os'] == "catos" && strstr($if, "vlan")) { $valid = 0; }
+  } else {
+    $valid = 0;
+  }
+
+  return $valid;
+}
+
+
 ?>

includes/polling/ports.inc.php

@@ -104,6 +104,8 @@ foreach ($ports_db as $port) { $ports[$port['ifIndex']] = $port; }
 
 /// New interface detection
 foreach ($port_stats as $ifIndex => $port)
+{
+  if (is_port_valid($port, $device))
   {
     if (!is_array($ports[$port['ifIndex']]))
     {
@@ -116,6 +118,7 @@ foreach ($port_stats as $ifIndex => $port)
       $ports[$ifIndex]['deleted'] = "0";
     }
   }
+}
 /// End New interface detection
 
 echo("\n");