From: Tim Beale Date: Tue, 19 Feb 2019 03:18:11 +0000 (+1300) Subject: selftest: Add helper functions to get IP addresses X-Git-Tag: talloc-2.2.0~173 X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=5e09d392115f2c1655cc0902a940723d9d5b9065;p=samba.git selftest: Add helper functions to get IP addresses Let's centralize these assumptions in one place. Signed-off-by: Tim Beale Reviewed-by: Andrew Bartlett --- diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index d74a4438ba4..8e8723c0b88 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -446,6 +446,22 @@ sub get_interface($) return $interfaces{$netbiosname}; } +sub get_ipv4_addr +{ + (my $hostname) = @_; + my $swiface = Samba::get_interface($hostname); + + return "127.0.0.$swiface"; +} + +sub get_ipv6_addr +{ + (my $hostname) = @_; + my $swiface = Samba::get_interface($hostname); + + return sprintf("fd00:0000:0000:0000:0000:0000:5357:5f%02x", $swiface); +} + sub cleanup_child($$) { my ($pid, $name) = @_; diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 19a2d2fc566..e176e3120c6 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1459,8 +1459,8 @@ sub provision($$$$$$$$$) my $swiface = Samba::get_interface($server); my %ret = (); my %createuser_env = (); - my $server_ip = "127.0.0.$swiface"; - my $server_ipv6 = sprintf("fd00:0000:0000:0000:0000:0000:5357:5f%02x", $swiface); + my $server_ip = Samba::get_ipv4_addr($server); + my $server_ipv6 = Samba::get_ipv6_addr($server); my $unix_name = ($ENV{USER} or $ENV{LOGNAME} or `PATH=/usr/ucb:$ENV{PATH} whoami`); chomp $unix_name; diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 8b62c5e9c11..bbe3ece9fc8 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -394,8 +394,8 @@ sub setup_dns_hub_internal($$$) $env->{hostname} = $hostname; $env->{swiface} = $swiface; - $env->{ipv4} = "127.0.0.$swiface"; - $env->{ipv6} = sprintf("fd00:0000:0000:0000:0000:0000:5357:5f%02x", $swiface); + $env->{ipv4} = Samba::get_ipv4_addr($hostname); + $env->{ipv6} = Samba::get_ipv6_addr($hostname); $env->{DNS_HUB_LOG} = "$prefix_abs/dns_hub.log"; @@ -673,8 +673,8 @@ sub provision_raw_prepare($$$$$$$$$$$$) $ctx->{tlsdir} = "$ctx->{privatedir}/tls"; - $ctx->{ipv4} = "127.0.0.$swiface"; - $ctx->{ipv6} = sprintf("fd00:0000:0000:0000:0000:0000:5357:5f%02x", $swiface); + $ctx->{ipv4} = Samba::get_ipv4_addr($hostname); + $ctx->{ipv6} = Samba::get_ipv6_addr($hostname); $ctx->{interfaces} = "$ctx->{ipv4}/8 $ctx->{ipv6}/64"; push(@{$ctx->{directories}}, $ctx->{privatedir}); @@ -1722,14 +1722,14 @@ sub provision_fl2000dc($$) sub provision_fl2003dc($$$) { my ($self, $prefix, $dcvars) = @_; - my $swiface1 = Samba::get_interface("fakednsforwarder1"); - my $swiface2 = Samba::get_interface("fakednsforwarder2"); + my $ip_addr1 = Samba::get_ipv4_addr("fakednsforwarder1"); + my $ip_addr2 = Samba::get_ipv4_addr("fakednsforwarder2"); print "PROVISIONING DC WITH FOREST LEVEL 2003...\n"; my $extra_conf_options = "allow dns updates = nonsecure and secure dcesrv:header signing = no dcesrv:max auth states = 0 - dns forwarder = 127.0.0.$swiface1 127.0.0.$swiface2"; + dns forwarder = $ip_addr1 $ip_addr2"; my $extra_provision_options = ["--use-ntvfs"]; my $ret = $self->provision($prefix, "domain controller", @@ -1747,8 +1747,8 @@ sub provision_fl2003dc($$$) return undef; } - $ret->{DNS_FORWARDER1} = "127.0.0.$swiface1"; - $ret->{DNS_FORWARDER2} = "127.0.0.$swiface2"; + $ret->{DNS_FORWARDER1} = $ip_addr1; + $ret->{DNS_FORWARDER2} = $ip_addr2; my @samba_tool_options; push (@samba_tool_options, Samba::bindir_path($self, "samba-tool"));