Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nsupdate: Adjust script to support simultaneous IPv4 and IPv6 updates

Browse source 
Adjust `nic_nsupdate_update` to use `wantipv4` and `wantipv6` and
support simultaneous IPv4 and IPv6 updates.

Also, set proper `status-ipv4` and `status-ipv6` values after successful
update.
This commit is contained in:
Indrajit Raychaudhuri 2023-12-01 18:02:35 -06:00
parent e0611ab192
commit bfe20e75f8
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ddclient.in
View file

@ -5964,16 +5964,13 @@ sub nic_nsupdate_update {
## nsupdate requires a port number to be separated by whitepace, not colon ## nsupdate requires a port number to be separated by whitepace, not colon
$server =~ s/:/ /; $server =~ s/:/ /;
my $zone = $config{$h}{'zone'}; my $zone = $config{$h}{'zone'};
my $ip = $config{$h}{'wantip'}; my $ipv4 = $config{$h}{'wantipv4'};
my $recordtype = ''; my $ipv6 = $config{$h}{'wantipv6'};
if (is_ipv6($ip)) { delete $config{$_}{'wantipv4'} foreach @hosts;
$recordtype = 'AAAA'; delete $config{$_}{'wantipv6'} foreach @hosts;
} else {
$recordtype = 'A';
}
delete $config{$_}{'wantip'} foreach @hosts;
info("setting IP address to %s for %s", $ip, $hosts); info("setting IPv4 address to %s for %s", $ipv4, $hosts) if ($ipv4);
info("setting IPv6 address to %s for %s", $ipv6, $hosts) if ($ipv6);
verbose("UPDATE:", "updating %s", $hosts); verbose("UPDATE:", "updating %s", $hosts);
## send separate requests for each zone with all hosts in that zone ## send separate requests for each zone with all hosts in that zone
@ -5982,14 +5979,18 @@ server $server
zone $zone. zone $zone.
EoINSTR1 EoINSTR1
foreach (@hosts) { foreach (@hosts) {
foreach my $ip ($ipv4, $ipv6) {
next if (!$ip);
my $type = ($ip eq ($ipv6 // '')) ? 'AAAA' : 'A';
$instructions .= <<"EoINSTR2"; $instructions .= <<"EoINSTR2";
update delete $_. $recordtype update delete $_. $type
update add $_. $config{$_}{'ttl'} $recordtype $ip update add $_. $config{$_}{'ttl'} $type $ip
EoINSTR2 EoINSTR2
} }
$instructions .= <<"EoINSTR3"; }
$instructions .= <<"EoINSTR4";
send send
EoINSTR3 EoINSTR4
my $command = "$binary -k $keyfile"; my $command = "$binary -k $keyfile";
$command .= " -v" if ynu($config{$h}{'tcp'}, 1, 0, 0); $command .= " -v" if ynu($config{$h}{'tcp'}, 1, 0, 0);
$command .= " -d" if (opt('debug')); $command .= " -d" if (opt('debug'));
@ -5999,9 +6000,14 @@ EoINSTR3
my $status = pipecmd($command, $instructions); my $status = pipecmd($command, $instructions);
if ($status eq 1) { if ($status eq 1) {
foreach (@hosts) { foreach (@hosts) {
$config{$_}{'ip'} = $ip;
$config{$_}{'mtime'} = $now; $config{$_}{'mtime'} = $now;
success("updating %s: %s: IP address set to %s", $_, $status, $ip); foreach my $ip ($ipv4, $ipv6) {
next if (!$ip);
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
$config{$_}{"ipv$ipv"} = $ip;
$config{$_}{"status-ipv$ipv"} = 'good';
success("updating %s: good: IPv%s address set to %s", $_, $ipv, $ip);
}
} }
} else { } else {
foreach (@hosts) { foreach (@hosts) {