135/snmp-info
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check for unreachable root ip before assignment

Browse Source
This commit is contained in:
Eric Miller
2006-04-05 01:57:12 +00:00
parent 409065375e
commit c530e25e02
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Info/Layer3/Passport.pm
View File

@@ -2,7 +2,7 @@
# Eric Miller # Eric Miller
# $Id$ # $Id$
# #
# Copyright (c) 2004-6 Eric Miller, Max Baker # Copyright (c) 2004 Eric Miller, Max Baker
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -409,12 +409,14 @@ sub root_ip {
next unless ((defined $ip_type) and ($ip_type =~ /circuitLess/i)); next unless ((defined $ip_type) and ($ip_type =~ /circuitLess/i));
my $ip = $rc_ip_addr->{$iid}; my $ip = $rc_ip_addr->{$iid};
next unless defined $ip; next unless defined $ip;
return $ip; return $ip if $passport->_snmp_connect_ip($ip);
} }
# Return Management Virtual IP address # Return Management Virtual IP address
return $virt_ip if ((defined $virt_ip) and ($virt_ip ne '0.0.0.0')); if ( (defined $virt_ip) and ($virt_ip ne '0.0.0.0') ) {
return $virt_ip if $passport->_snmp_connect_ip($virt_ip);
}
} }
# Return OSPF Router ID # Return OSPF Router ID
@@ -422,7 +424,7 @@ sub root_ip {
foreach my $iid (keys %$rc_ip_addr){ foreach my $iid (keys %$rc_ip_addr){
my $ip = $rc_ip_addr->{$iid}; my $ip = $rc_ip_addr->{$iid};
next unless $router_ip eq $ip; next unless $router_ip eq $ip;
return $router_ip; return $router_ip if $passport->_snmp_connect_ip($router_ip);
} }
} }
@@ -431,7 +433,7 @@ sub root_ip {
my $port = $sonmp_topo_port->{$entry}; my $port = $sonmp_topo_port->{$entry};
next unless $port == 0; next unless $port == 0;
my $ip = $sonmp_topo_ip->{$entry}; my $ip = $sonmp_topo_ip->{$entry};
return $ip if ((defined $ip) and ($ip ne '0.0.0.0')); return $ip if ( (defined $ip) and ($ip ne '0.0.0.0') and ($passport->_snmp_connect_ip($ip)) );
} }
return undef; return undef;
} }