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

easydns: Simplify response processing

Browse source
This commit is contained in:
Richard Hansen 2024-07-20 00:07:20 -04:00
parent 7a2625b7a7
commit 6992a34028
1 changed files with 26 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
ddclient.in
View file

@ -4827,42 +4827,33 @@ sub nic_easydns_update {
next; next;
} }
next if !header_ok($h, $reply); next if !header_ok($h, $reply);
my @reply = split /\n/, $reply; (my $body = $reply) =~ s/^.*?\n\n//s or do {
my $state = 'header'; failed("$h: Could not connect to $config{$h}{'server'}");
for my $line (@reply) { next;
if ($state eq 'header') { };
$state = 'body'; my ($status) = $body =~ qr/^(\S*)\b/;
} elsif ($state eq 'body') { $config{$h}{'status-ipv4'} = $status if $ipv4;
$state = 'results' if $line eq ''; $config{$h}{'status-ipv6'} = $status if $ipv6;
} elsif ($state =~ /^results/) { if ($status eq 'NOERROR') {
$state = 'results2'; $config{$h}{'ipv4'} = $ipv4;
my ($status) = $line =~ /^(\S*)\b.*/; $config{$h}{'ipv6'} = $ipv6;
$config{$h}{'status-ipv4'} = $status if $ipv4; $config{$h}{'mtime'} = $now;
$config{$h}{'status-ipv6'} = $status if $ipv6; success("$h: IPv4 address set to $ipv4") if $ipv4;
if ($status eq 'NOERROR') { success("$h: IPv6 address set to $ipv6") if $ipv6;
$config{$h}{'ipv4'} = $ipv4; } elsif ($status =~ /TOOSOON/) {
$config{$h}{'ipv6'} = $ipv6; ## make sure we wait at least a little
$config{$h}{'mtime'} = $now; my ($wait, $units) = (5, 'm');
success("$h: IPv4 address set to $ipv4") if $ipv4; my ($sec, $scale) = ($wait, 1);
success("$h: IPv6 address set to $ipv6") if $ipv6; ($scale, $units) = (1, 'seconds') if $units eq 's';
} elsif ($status =~ /TOOSOON/) { ($scale, $units) = (60, 'minutes') if $units eq 'm';
## make sure we wait at least a little ($scale, $units) = (60*60, 'hours') if $units eq 'h';
my ($wait, $units) = (5, 'm'); $config{$h}{'wtime'} = $now + $sec;
my ($sec, $scale) = ($wait, 1); warning("$h: $status: wait $wait $units before further updates");
($scale, $units) = (1, 'seconds') if $units eq 's'; } elsif (exists $errors{$status}) {
($scale, $units) = (60, 'minutes') if $units eq 'm'; failed("$h: $status: $errors{$status}");
($scale, $units) = (60*60, 'hours') if $units eq 'h'; } else {
$config{$h}{'wtime'} = $now + $sec; failed("$h: unexpected result: $body");
warning("$h: $status: wait $wait $units before further updates");
} elsif (exists $errors{$status}) {
failed("$h: $status: $errors{$status}");
} else {
failed("$h: unexpected result: $line");
}
last;
}
} }
failed("$h: Could not connect to $config{$h}{'server'}") if $state ne 'results2';
} }
} }