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

noip: Simplify response processing

Browse source
This commit is contained in:
Richard Hansen 2024-07-24 21:20:33 -04:00
parent 5b433c3cd5
commit c0b28f344f
1 changed files with 36 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
ddclient.in
View file

@ -4123,70 +4123,60 @@ sub nic_noip_update {
password => $groupcfg{'password'}, password => $groupcfg{'password'},
); );
next if !header_ok($hosts, $reply); next if !header_ok($hosts, $reply);
(my $body = $reply) =~ s/^.*?\n\n//s or do {
my @reply = split /\n/, $reply; failed("updating %s: Could not connect to %s.", $hosts, $groupcfg{'server'});
my $state = 'header'; next;
};
my @reply = split(/\n/, $body);
for my $line (@reply) { for my $line (@reply) {
if ($state eq 'header') { my ($status, $returnedips) = split / /, lc $line;
$state = 'body'; my $h = shift @hosts;
} elsif ($state eq 'body') { for my $ip (split_by_comma($returnedips)) {
$state = 'results' if $line eq ''; next if (!$ip);
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
} elsif ($state =~ /^results/) { $config{$h}{"status-ipv$ipv"} = $status;
$state = 'results2'; }
my ($status, $returnedips) = split / /, lc $line;
my $h = shift @hosts;
if ($status eq 'good') {
$config{$h}{'mtime'} = $now;
for my $ip (split_by_comma($returnedips)) { for my $ip (split_by_comma($returnedips)) {
next if (!$ip); next if (!$ip);
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4'; my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
$config{$h}{"status-ipv$ipv"} = $status; $config{$h}{"ipv$ipv"} = $ip;
success("updating %s: %s: IPv%s address set to %s", $h, $status, $ipv, $ip);
} }
if ($status eq 'good') { } elsif (exists $errors{$status}) {
if ($status eq 'nochg') {
warning("updating %s: %s: %s", $h, $status, $errors{$status});
$config{$h}{'mtime'} = $now; $config{$h}{'mtime'} = $now;
for my $ip (split_by_comma($returnedips)) { for my $ip (split_by_comma($returnedips)) {
next if (!$ip); next if (!$ip);
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4'; my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
$config{$h}{"ipv$ipv"} = $ip; $config{$h}{"ipv$ipv"} = $ip;
success("updating %s: %s: IPv%s address set to %s", $h, $status, $ipv, $ip); $config{$h}{"status-ipv$ipv"} = 'good';
} }
} elsif (exists $errors{$status}) {
if ($status eq 'nochg') {
warning("updating %s: %s: %s", $h, $status, $errors{$status});
$config{$h}{'mtime'} = $now;
for my $ip (split_by_comma($returnedips)) {
next if (!$ip);
my $ipv = ($ip eq ($ipv6 // '')) ? '6' : '4';
$config{$h}{"ipv$ipv"} = $ip;
$config{$h}{"status-ipv$ipv"} = 'good';
}
} else {
failed("updating %s: %s: %s", $h, $status, $errors{$status});
}
} elsif ($status =~ /w(\d+)(.)/) {
my ($wait, $units) = ($1, lc $2);
my ($sec, $scale) = ($wait, 1);
($scale, $units) = (1, 'seconds') if $units eq 's';
($scale, $units) = (60, 'minutes') if $units eq 'm';
($scale, $units) = (60*60, 'hours') if $units eq 'h';
$sec = $wait * $scale;
$config{$h}{'wtime'} = $now + $sec;
warning("updating %s: %s: wait %s %s before further updates", $h, $status, $wait, $units);
} else { } else {
failed("updating %s: unexpected status (%s)", $h, $line); failed("updating %s: %s: %s", $h, $status, $errors{$status});
} }
} elsif ($status =~ /w(\d+)(.)/) {
my ($wait, $units) = ($1, lc $2);
my ($sec, $scale) = ($wait, 1);
($scale, $units) = (1, 'seconds') if $units eq 's';
($scale, $units) = (60, 'minutes') if $units eq 'm';
($scale, $units) = (60*60, 'hours') if $units eq 'h';
$sec = $wait * $scale;
$config{$h}{'wtime'} = $now + $sec;
warning("updating %s: %s: wait %s %s before further updates", $h, $status, $wait, $units);
} else {
failed("updating %s: unexpected status (%s)", $h, $line);
} }
} }
failed("updating %s: Could not connect to %s.", $hosts, $groupcfg{'server'})
if $state ne 'results2';
} }
} }