Browse Source

Merge branch 'develop' of github.com:opensolutions/OSS_SNMP into develop

Barry O'Donovan 13 years ago
parent
commit
3d149885bd
1 changed files with 12 additions and 3 deletions
  1. 12 3
      OSS/SNMP/MIBS/Cisco/CDP.php

+ 12 - 3
OSS/SNMP/MIBS/Cisco/CDP.php

@@ -636,9 +636,18 @@ class CDP extends \OSS\SNMP\MIBS\Cisco
             if( !isset( $devices[ $feNeighbour ] ) )
             {
                 $snmp = new \OSS\SNMP( $feNeighbour, $this->getSNMP()->getCommunity() );
-                $devices[ $feNeighbour ] = $snmp->useCisco_CDP()->neighbours();
-                unset( $snmp );
-                $this->crawl( $devices, $feNeighbour, $ignore );
+
+                try
+                {
+                    $devices[ $feNeighbour ] = $snmp->useCisco_CDP()->neighbours();
+                    unset( $snmp );
+                    $this->crawl( $devices, $feNeighbour, $ignore );
+                }
+                catch( \OSS\Exception $e )
+                {
+                    // this device did not respond / have CDP enabled / CDP available - skip
+                    unset( $devices[$feNeighbour] );
+                }
             }
         }