Skip default CPU management addresses on VSP and 8800/8600 series in L3::Passport to prevent erroneous duplicate addresses

This commit is contained in:
Eric A. Miller
2014-01-20 21:59:53 -05:00
parent d68b2047b0
commit 22642c1095
2 changed files with 14 additions and 0 deletions

View File

@@ -23,6 +23,8 @@ version 3.11
L3::Netscreen L3::Netscreen
* Fix Extreme XOS i_vlan_membership - Revert [28bbe0], fix bug with * Fix Extreme XOS i_vlan_membership - Revert [28bbe0], fix bug with
untagged being added to @ret twice (Robert Kerr) untagged being added to @ret twice (Robert Kerr)
* Skip default CPU management addresses on VSP and 8800/8600 series in
L3::Passport to prevent erroneous duplicate addresses
version 3.10 (2013-12-16) version 3.10 (2013-12-16)

View File

@@ -433,6 +433,10 @@ sub ip_index {
foreach my $ip ( keys %$ip_index ) { foreach my $ip ( keys %$ip_index ) {
my $iid = $ip_index->{$ip}; my $iid = $ip_index->{$ip};
next unless defined $iid; next unless defined $iid;
# Skip VSP default CPU addresses
next if ($ip =~ /^192\.168\.1\.1/);
# Skip default CPU addresses
next if ($ip =~ /^192\.168\.168\.16[89]/);
$ip_index{$ip} = $iid; $ip_index{$ip} = $iid;
} }
@@ -447,6 +451,8 @@ sub ip_index {
foreach my $cid ( keys %$cpu_ip ) { foreach my $cid ( keys %$cpu_ip ) {
my $c_ip = $cpu_ip->{$cid}; my $c_ip = $cpu_ip->{$cid};
next unless defined $c_ip; next unless defined $c_ip;
# Skip default CPU addresses
next if ($c_ip =~ /192\.168\.168\.16[89]/);
$ip_index{$c_ip} = $cid; $ip_index{$c_ip} = $cid;
} }
@@ -467,6 +473,10 @@ sub ip_netmask {
my %ip_index; my %ip_index;
foreach my $iid ( keys %$ip_mask ) { foreach my $iid ( keys %$ip_mask ) {
# Skip VSP default CPU addresses
next if ($iid =~ /^192\.168\.1\./);
# Skip default CPU addresses
next if ($iid =~ /^192\.168\.168\.16[89]/);
my $mask = $ip_mask->{$iid}; my $mask = $ip_mask->{$iid};
next unless defined $mask; next unless defined $mask;
@@ -485,6 +495,8 @@ sub ip_netmask {
foreach my $iid ( keys %$cpu_mask ) { foreach my $iid ( keys %$cpu_mask ) {
my $c_ip = $cpu_ip->{$iid}; my $c_ip = $cpu_ip->{$iid};
next unless defined $c_ip; next unless defined $c_ip;
# Skip default CPU addresses
next if ($c_ip =~ /192\.168\.168\.16[89]/);
my $c_mask = $cpu_mask->{$iid}; my $c_mask = $cpu_mask->{$iid};
next unless defined $c_mask; next unless defined $c_mask;