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

Merge pull request #502 from tduboys/dyndns2_dual_stack

Browse source
This commit is contained in:
Sandro 2023-01-29 17:39:08 +01:00 committed by GitHub
commit 999dab7f53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ddclient.in
View file

@ -3820,7 +3820,7 @@ sub nic_updateable {
success("%s: skipped: IP address was already set to %s.", $host, $ip); success("%s: skipped: IP address was already set to %s.", $host, $ip);
} }
if ($usev4 ne 'disabled') { if ($usev4 ne 'disabled') {
success("%s: skipped: IPv4 address was already set to %s.", $host, $ipv6); success("%s: skipped: IPv4 address was already set to %s.", $host, $ipv4);
} }
if ($usev6 ne 'disabled') { if ($usev6 ne 'disabled') {
success("%s: skipped: IPv6 address was already set to %s.", $host, $ipv6); success("%s: skipped: IPv6 address was already set to %s.", $host, $ipv6);
@ -4069,10 +4069,13 @@ sub nic_dyndns2_update {
my @hosts = @{$groups{$sig}}; my @hosts = @{$groups{$sig}};
my $hosts = join(',', @hosts); my $hosts = join(',', @hosts);
my $h = $hosts[0]; my $h = $hosts[0];
my $ip = $config{$h}{'wantip'}; my $ipv4 = $config{$h}{'wantipv4'};
delete $config{$_}{'wantip'} foreach @hosts; my $ipv6 = $config{$h}{'wantipv6'};
delete $config{$_}{'wantipv4'} foreach @hosts;
delete $config{$_}{'wantipv6'} 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);
## Select the DynDNS system to update ## Select the DynDNS system to update
@ -4091,7 +4094,11 @@ sub nic_dyndns2_update {
$url .= "&hostname=$hosts"; $url .= "&hostname=$hosts";
$url .= "&myip="; $url .= "&myip=";
$url .= $ip if $ip; $url .= $ipv4 if $ipv4;
if ($ipv6) {
$url .= "," if $ipv4;
$url .= $ipv6;
}
## some args are not valid for a custom domain. ## some args are not valid for a custom domain.
$url .= "&wildcard=ON" if ynu($config{$h}{'wildcard'}, 1, 0, 0); $url .= "&wildcard=ON" if ynu($config{$h}{'wildcard'}, 1, 0, 0);
@ -4114,7 +4121,6 @@ sub nic_dyndns2_update {
my @reply = split /\n/, $reply; my @reply = split /\n/, $reply;
my $state = 'header'; my $state = 'header';
my $returnedip = $ip;
foreach my $line (@reply) { foreach my $line (@reply) {
if ($state eq 'header') { if ($state eq 'header') {
@ -4128,22 +4134,28 @@ sub nic_dyndns2_update {
# bug #10: some dyndns providers does not return the IP so # bug #10: some dyndns providers does not return the IP so
# we can't use the returned IP # we can't use the returned IP
my ($status, $returnedip) = split / /, lc $line; my ($status, $returnedips) = split / /, lc $line;
$ip = $returnedip if (not $ip);
my $h = shift @hosts; my $h = shift @hosts;
$config{$h}{'status'} = $status; $config{$h}{'status'} = $status;
$config{$h}{'status-ipv4'} = $status if $ipv4;
$config{$h}{'status-ipv6'} = $status if $ipv6;
if ($status eq 'good') { if ($status eq 'good') {
$config{$h}{'ip'} = $ip; $config{$h}{'ipv4'} = $ipv4 if $ipv4;
$config{$h}{'ipv6'} = $ipv6 if $ipv6;
$config{$h}{'mtime'} = $now; $config{$h}{'mtime'} = $now;
success("updating %s: %s: IP address set to %s", $h, $status, $ip); success("updating %s: %s: IPv4 address set to %s", $h, $status, $ipv4) if $ipv4;
success("updating %s: %s: IPv6 address set to %s", $h, $status, $ipv6) if $ipv6;
} elsif (exists $errors{$status}) { } elsif (exists $errors{$status}) {
if ($status eq 'nochg') { if ($status eq 'nochg') {
warning("updating %s: %s: %s", $h, $status, $errors{$status}); warning("updating %s: %s: %s", $h, $status, $errors{$status});
$config{$h}{'ip'} = $ip; $config{$h}{'ipv4'} = $ipv4 if $ipv4;
$config{$h}{'ipv6'} = $ipv6 if $ipv6;
$config{$h}{'mtime'} = $now; $config{$h}{'mtime'} = $now;
$config{$h}{'status'} = 'good'; $config{$h}{'status'} = 'good';
$config{$h}{'status-ipv4'} = 'good' if $ipv4;
$config{$h}{'status-ipv6'} = 'good' if $ipv6;
} else { } else {
failed("updating %s: %s: %s", $h, $status, $errors{$status}); failed("updating %s: %s: %s", $h, $status, $errors{$status});