Improve deduplication of redundant use* queries
This commit is contained in:
Richard Hansen
parent
c71f6f6eae
commit
ad3cd11446
2 changed files with 79 additions and 57 deletions
84
ddclient.in
84
ddclient.in
|
|
@ -1533,9 +1533,9 @@ sub runpostscript {
|
||||||
######################################################################
|
######################################################################
|
||||||
sub update_nics {
|
sub update_nics {
|
||||||
my %examined = ();
|
my %examined = ();
|
||||||
my %iplist = ();
|
my %use_results;
|
||||||
my %ipv4list = ();
|
my %usev4_results;
|
||||||
my %ipv6list = ();
|
my %usev6_results;
|
||||||
|
|
||||||
for my $p (sort keys %protocols) {
|
for my $p (sort keys %protocols) {
|
||||||
my (@hosts, %ipsv4, %ipsv6) = ();
|
my (@hosts, %ipsv4, %ipsv6) = ();
|
||||||
|
|
@ -1547,74 +1547,44 @@ sub update_nics {
|
||||||
my $use = opt('use', $h);
|
my $use = opt('use', $h);
|
||||||
my $usev4 = opt('usev4', $h);
|
my $usev4 = opt('usev4', $h);
|
||||||
my $usev6 = opt('usev6', $h);
|
my $usev6 = opt('usev6', $h);
|
||||||
my $arg_ip = opt('ip', $h) // '';
|
|
||||||
my $arg_ipv4 = opt('ipv4', $h) // '';
|
|
||||||
my $arg_ipv6 = opt('ipv6', $h) // '';
|
|
||||||
my $arg_fw = opt('fw', $h) // '';
|
|
||||||
my $arg_fwv4 = opt('fwv4', $h) // '';
|
|
||||||
my $arg_fwv6 = opt('fwv6', $h) // '';
|
|
||||||
my $arg_if = opt('if', $h) // '';
|
|
||||||
my $arg_ifv4 = opt('ifv4', $h) // '';
|
|
||||||
my $arg_ifv6 = opt('ifv6', $h) // '';
|
|
||||||
my $arg_web = opt('web', $h) // '';
|
|
||||||
my $arg_webv4 = opt('webv4', $h) // '';
|
|
||||||
my $arg_webv6 = opt('webv6', $h) // '';
|
|
||||||
my $arg_cmd = opt('cmd', $h) // '';
|
|
||||||
my $arg_cmdv4 = opt('cmdv4', $h) // '';
|
|
||||||
my $arg_cmdv6 = opt('cmdv6', $h) // '';
|
|
||||||
my $ip = undef;
|
my $ip = undef;
|
||||||
my $ipv4 = undef;
|
my $ipv4 = undef;
|
||||||
my $ipv6 = undef;
|
my $ipv6 = undef;
|
||||||
|
|
||||||
if ($use ne 'disabled') {
|
if ($use ne 'disabled') {
|
||||||
if (exists $iplist{$use}{$arg_ip}{$arg_fw}{$arg_if}{$arg_web}{$arg_cmd}) {
|
my %inputs = strategy_inputs('use', $h);
|
||||||
# If we have already done a get_ip() for this, don't do it again.
|
my $sig = repr(\%inputs, Indent => 0);
|
||||||
$ip = $iplist{$use}{$arg_ip}{$arg_fw}{$arg_if}{$arg_web}{$arg_cmd};
|
$use_results{$sig} //= get_ip(%inputs);
|
||||||
} else {
|
if (!is_ipv4($use_results{$sig}) && !is_ipv6($use_results{$sig})) {
|
||||||
# Else need to find the IP address...
|
warning("unable to determine IP address with strategy '--use=$use'")
|
||||||
$ip = get_ip(strategy_inputs('use', $h));
|
if !$daemon || opt('verbose');
|
||||||
if (is_ipv4($ip) || is_ipv6($ip)) {
|
delete $use_results{$sig};
|
||||||
# And if it is valid, remember it...
|
|
||||||
$iplist{$use}{$arg_ip}{$arg_fw}{$arg_if}{$arg_web}{$arg_cmd} = $ip;
|
|
||||||
} else {
|
|
||||||
warning("unable to determine IP address with strategy '--use=$use'")
|
|
||||||
if !$daemon || opt('verbose');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
$ip = $use_results{$sig};
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($usev4 ne 'disabled') {
|
if ($usev4 ne 'disabled') {
|
||||||
if (exists $ipv4list{$usev4}{$arg_ipv4}{$arg_fwv4}{$arg_ifv4}{$arg_webv4}{$arg_cmdv4}) {
|
my %inputs = strategy_inputs('usev4', $h);
|
||||||
# If we have already done a get_ipv4() for this, don't do it again.
|
my $sig = repr(\%inputs, Indent => 0);
|
||||||
$ipv4 = $ipv4list{$usev4}{$arg_ipv4}{$arg_fwv4}{$arg_ifv4}{$arg_webv4}{$arg_cmdv4};
|
$usev4_results{$sig} //= get_ipv4(%inputs);
|
||||||
} else {
|
if (!is_ipv4($usev4_results{$sig})) {
|
||||||
# Else need to find the IPv4 address...
|
warning("unable to determine IPv4 address with strategy '--usev4=$usev4'")
|
||||||
$ipv4 = get_ipv4(strategy_inputs('usev4', $h));
|
if !$daemon || opt('verbose');
|
||||||
if (is_ipv4($ipv4)) {
|
delete $usev4_results{$sig};
|
||||||
# And if it is valid, remember it...
|
|
||||||
$ipv4list{$usev4}{$arg_ipv4}{$arg_fwv4}{$arg_ifv4}{$arg_webv4}{$arg_cmdv4} = $ipv4;
|
|
||||||
} else {
|
|
||||||
warning("unable to determine IPv4 address with strategy '--usev4=$usev4'")
|
|
||||||
if !$daemon || opt('verbose');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
$ipv4 = $usev4_results{$sig};
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($usev6 ne 'disabled') {
|
if ($usev6 ne 'disabled') {
|
||||||
if (exists $ipv6list{$usev6}{$arg_ipv6}{$arg_fwv6}{$arg_ifv6}{$arg_webv6}{$arg_cmdv6}) {
|
my %inputs = strategy_inputs('usev6', $h);
|
||||||
# If we have already done a get_ipv6() for this, don't do it again.
|
my $sig = repr(\%inputs, Indent => 0);
|
||||||
$ipv6 = $ipv6list{$usev6}{$arg_ipv6}{$arg_fwv6}{$arg_ifv6}{$arg_webv6}{$arg_cmdv6};
|
$usev6_results{$sig} //= get_ipv6(%inputs);
|
||||||
} else {
|
if (!is_ipv6($usev6_results{$sig})) {
|
||||||
# Else need to find the IPv6 address...
|
warning("unable to determine IPv6 address with strategy '--usev6=$usev6'")
|
||||||
$ipv6 = get_ipv6(strategy_inputs('usev6', $h));
|
if !$daemon || opt('verbose');
|
||||||
if (is_ipv6($ipv6)) {
|
delete $usev6_results{$sig};
|
||||||
# And if it is valid, remember it...
|
|
||||||
$ipv6list{$usev6}{$arg_ipv6}{$arg_fwv6}{$arg_ifv6}{$arg_webv6}{$arg_cmdv6} = $ipv6;
|
|
||||||
} else {
|
|
||||||
warning("unable to determine IPv6 address with strategy '--usev6=$usev6'")
|
|
||||||
if !$daemon || opt('verbose');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
$ipv6 = $usev6_results{$sig};
|
||||||
}
|
}
|
||||||
|
|
||||||
$ip //= $ipv4 // $ipv6;
|
$ip //= $ipv4 // $ipv6;
|
||||||
|
|
|
||||||
|
|
@ -272,6 +272,58 @@ my @test_cases = (
|
||||||
%$_,
|
%$_,
|
||||||
};
|
};
|
||||||
} {cfg => {use => 'web'}}, {cfg => {usev4 => 'webv4'}}),
|
} {cfg => {use => 'web'}}, {cfg => {usev4 => 'webv4'}}),
|
||||||
|
map({
|
||||||
|
my %cfg = %{delete($_->{cfg})};
|
||||||
|
my $desc = join(' ', map("$_=$cfg{$_}", sort(keys(%cfg))));
|
||||||
|
{
|
||||||
|
desc => "deduplicates identical IP discovery, $desc",
|
||||||
|
cfg => {
|
||||||
|
hosta => {protocol => 'legacy', %cfg},
|
||||||
|
hostb => {protocol => 'legacy', %cfg},
|
||||||
|
},
|
||||||
|
want_reqs_webv4 => 1,
|
||||||
|
want_updates => [['hosta', 'hostb']],
|
||||||
|
want_recap_changes => {
|
||||||
|
hosta => {
|
||||||
|
'atime' => $ddclient::now,
|
||||||
|
'ipv4' => '192.0.2.1',
|
||||||
|
'mtime' => $ddclient::now,
|
||||||
|
'status-ipv4' => 'good',
|
||||||
|
},
|
||||||
|
hostb => {
|
||||||
|
'atime' => $ddclient::now,
|
||||||
|
'ipv4' => '192.0.2.1',
|
||||||
|
'mtime' => $ddclient::now,
|
||||||
|
'status-ipv4' => 'good',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
%$_,
|
||||||
|
};
|
||||||
|
} {cfg => {use => 'web'}}, {cfg => {usev4 => 'webv4'}}),
|
||||||
|
{
|
||||||
|
desc => "deduplicates identical IP discovery, usev6=webv6",
|
||||||
|
ipv6 => 1,
|
||||||
|
cfg => {
|
||||||
|
hosta => {protocol => 'legacy', usev6 => 'webv6'},
|
||||||
|
hostb => {protocol => 'legacy', usev6 => 'webv6'},
|
||||||
|
},
|
||||||
|
want_reqs_webv6 => 1,
|
||||||
|
want_updates => [['hosta', 'hostb']],
|
||||||
|
want_recap_changes => {
|
||||||
|
hosta => {
|
||||||
|
'atime' => $ddclient::now,
|
||||||
|
'ipv6' => '2001:db8::1',
|
||||||
|
'mtime' => $ddclient::now,
|
||||||
|
'status-ipv6' => 'good',
|
||||||
|
},
|
||||||
|
hostb => {
|
||||||
|
'atime' => $ddclient::now,
|
||||||
|
'ipv6' => '2001:db8::1',
|
||||||
|
'mtime' => $ddclient::now,
|
||||||
|
'status-ipv6' => 'good',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
for my $tc (@test_cases) {
|
for my $tc (@test_cases) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue