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

dyndns2: Simplify response parsing

Browse source
This commit is contained in:
Richard Hansen 2024-07-13 04:01:22 -04:00
parent 60f931e7da
commit 45e3603918
1 changed files with 49 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
ddclient.in
View file

@ -4073,61 +4073,56 @@ sub nic_dyndns2_update {
next; next;
} }
next if !header_ok($hosts, $reply); next if !header_ok($hosts, $reply);
my @reply = split /\n/, $reply; # Some services can return 200 OK even if there is an error (e.g., bad authentication,
my $state = 'header'; # updates too frequent) so the body of the response must also be checked.
for my $line (@reply) { (my $body = $reply) =~ s/^.*?\n\n//s;
if ($state eq 'header') { my ($line) = grep(qr/^results/, split(qr/\n/, $body));
$state = 'body'; if (!$line) {
} elsif ($state eq 'body') { failed("updating %s: Could not connect to %s.", $hosts, $groupcfg{'server'});
$state = 'results' if $line eq ''; next;
} elsif ($state =~ /^results/) { }
$state = 'results2'; # 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, $returnedips) = split / /, lc $line;
my ($status, $returnedips) = split / /, lc $line; for my $h (@hosts) {
for my $h (@hosts) { $config{$h}{'status-ipv4'} = $status if $ipv4;
$config{$h}{'status-ipv4'} = $status if $ipv4; $config{$h}{'status-ipv6'} = $status if $ipv6;
$config{$h}{'status-ipv6'} = $status if $ipv6; }
} if ($status eq 'good') {
if ($status eq 'good') { for my $h (@hosts) {
for my $h (@hosts) { $config{$h}{'ipv4'} = $ipv4 if $ipv4;
$config{$h}{'ipv4'} = $ipv4 if $ipv4; $config{$h}{'ipv6'} = $ipv6 if $ipv6;
$config{$h}{'ipv6'} = $ipv6 if $ipv6; $config{$h}{'mtime'} = $now;
$config{$h}{'mtime'} = $now; }
} success("updating %s: %s: IPv4 address set to %s", $hosts, $status, $ipv4) if $ipv4;
success("updating %s: %s: IPv4 address set to %s", $hosts, $status, $ipv4) if $ipv4; success("updating %s: %s: IPv6 address set to %s", $hosts, $status, $ipv6) if $ipv6;
success("updating %s: %s: IPv6 address set to %s", $hosts, $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", $hosts, $status, $errors{$status});
warning("updating %s: %s: %s", $hosts, $status, $errors{$status}); for my $h (@hosts) {
for my $h (@hosts) { $config{$h}{'ipv4'} = $ipv4 if $ipv4;
$config{$h}{'ipv4'} = $ipv4 if $ipv4; $config{$h}{'ipv6'} = $ipv6 if $ipv6;
$config{$h}{'ipv6'} = $ipv6 if $ipv6; $config{$h}{'mtime'} = $now;
$config{$h}{'mtime'} = $now; $config{$h}{'status-ipv4'} = 'good' if $ipv4;
$config{$h}{'status-ipv4'} = 'good' if $ipv4; $config{$h}{'status-ipv6'} = 'good' if $ipv6;
$config{$h}{'status-ipv6'} = 'good' if $ipv6; }
} } else {
} else { failed("updating %s: %s: %s", $hosts, $status, $errors{$status});
failed("updating %s: %s: %s", $hosts, $status, $errors{$status}); }
} } elsif ($status =~ /w(\d+)(.)/) {
} elsif ($status =~ /w(\d+)(.)/) { my ($wait, $units) = ($1, lc $2);
my ($wait, $units) = ($1, lc $2); my ($sec, $scale) = ($wait, 1);
my ($sec, $scale) = ($wait, 1); ($scale, $units) = (1, 'seconds') if $units eq 's';
($scale, $units) = (1, 'seconds') if $units eq 's'; ($scale, $units) = (60, 'minutes') if $units eq 'm';
($scale, $units) = (60, 'minutes') if $units eq 'm'; ($scale, $units) = (60*60, 'hours') if $units eq 'h';
($scale, $units) = (60*60, 'hours') if $units eq 'h'; $sec = $wait * $scale;
$sec = $wait * $scale; for my $h (@hosts) {
for my $h (@hosts) { $config{$h}{'wtime'} = $now + $sec;
$config{$h}{'wtime'} = $now + $sec; }
} warning("updating %s: %s: wait %s %s before further updates", $hosts, $status, $wait, $units);
warning("updating %s: %s: wait %s %s before further updates", $hosts, $status, $wait, $units); } else {
} else { failed("updating %s: unexpected status (%s)", $hosts, $line);
failed("updating %s: unexpected status (%s)", $hosts, $line);
}
}
} }
failed("updating %s: Could not connect to %s.", $hosts, $groupcfg{'server'})
if $state ne 'results2';
} }
} }