Author: fapeeler
Date: Thu Jul 8 19:42:03 2010
New Revision: 961901
URL: http://svn.apache.org/viewvc?rev=961901&view=rev
Log:
VCL-210
$ipaddress was not defined or had assigned value which caused pattern match
check on 127.0.0.1 to not get picked up
So loopback and private address was getting returned
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=961901&r1=961900&r2=961901&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Thu Jul 8 19:42:03 2010
@@ -1617,7 +1617,7 @@ sub getdynamicaddress {
# skip class a,b,c private addresses
next if ($l !~ /IP(.*)?Address[\s\.:]*([\d\.]*)/);
my $ip_address_found = $2;
- next if ($ip_address && $ip_address_found =~
/^(10|127|192\.168|172\.(1[6-9]|2[0-9]|3[0-1]))\./);
+ next if ($ip_address_found =~
/^(10|127|192\.168|172\.(1[6-9]|2[0-9]|3[0-1]))\./);
next if ($ip_address_found =~ /$privateIP/);
$ip_address = $ip_address_found;
}
@@ -1632,7 +1632,7 @@ sub getdynamicaddress {
# skip class a,b,c private addresses
next if ($l !~ /inet addr:([\d\.]*)/);
my $ip_address_found = $1;
- next if ($ip_address && $ip_address_found =~
/^(10|127|192\.168|172\.(1[6-9]|2[0-9]|3[0-1]))\./);
+ next if ($ip_address_found =~
/^(10|127|192\.168|172\.(1[6-9]|2[0-9]|3[0-1]))\./);
next if ($ip_address_found =~ /$privateIP/);
$ip_address = $ip_address_found;
}