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

Don't issue warnings when freedns IP didn't change

Browse source 
Before this update, freedns warnings would appear in the log even though
FreeDNS sent back a code 200 with a message indicating the IP address was
already correct.  A simple regex change was all that was needed to make this a
success instead.  Now, it looks like this:

DEBUG:    server = freedns.afraid.org
SUCCESS:  updating xxx.xxx.xxx good: IP address has not changed

Conflicts:
	ddclient
This commit is contained in:
Erik Gregg 2015-11-28 13:28:46 -05:00
parent a2ea922aa3
commit b478bf1a85
2 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,5 +1,5 @@
=============================================================================== ===============================================================================
# DDCLIENT v3.8.2 # DDCLIENT v3.8.3
ddclient is a Perl client used to update dynamic DNS entries for accounts ddclient is a Perl client used to update dynamic DNS entries for accounts
on many dynamic DNS services. on many dynamic DNS services.

59
ddclient
View file

@ -3704,10 +3704,7 @@ EoEXAMPLE
## ##
###################################################################### ######################################################################
sub nic_freedns_update { sub nic_freedns_update {
debug("\nnic_freedns_update -------------------"); debug("\nnic_freedns_update -------------------");
## First get the list of updatable hosts ## First get the list of updatable hosts
my $url; my $url;
$url = "http://$config{$_[0]}{'server'}/api/?action=getdyndns&sha=".&sha1_hex("$config{$_[0]}{'login'}|$config{$_[0]}{'password'}"); $url = "http://$config{$_[0]}{'server'}/api/?action=getdyndns&sha=".&sha1_hex("$config{$_[0]}{'login'}|$config{$_[0]}{'password'}");
@ -3733,34 +3730,36 @@ sub nic_freedns_update {
info("setting IP address to %s for %s", $ip, $h); info("setting IP address to %s for %s", $ip, $h);
verbose("UPDATE:","updating %s", $h); verbose("UPDATE:","updating %s", $h);
if($ip eq $freedns_hosts{$h}->[1]) { if($ip eq $freedns_hosts{$h}->[1]) {
$config{$h}{'ip'} = $ip; $config{$h}{'ip'} = $ip;
$config{$h}{'mtime'} = $now; $config{$h}{'mtime'} = $now;
$config{$h}{'status'} = 'good'; $config{$h}{'status'} = 'good';
success("update not necessary %s: good: IP address already set to %s", $h, $ip); success("update not necessary %s: good: IP address already set to %s", $h, $ip);
} else { } else {
my $reply = geturl(opt('proxy'), $freedns_hosts{$h}->[2]); my $reply = geturl(opt('proxy'), $freedns_hosts{$h}->[2]);
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $h, $freedns_hosts{$h}->[2]); failed("updating %s: Could not connect to %s.", $h, $freedns_hosts{$h}->[2]);
last; last;
} }
if(!header_ok($h, $reply)) { if(!header_ok($h, $reply)) {
$config{$h}{'status'} = 'failed'; $config{$h}{'status'} = 'failed';
last; last;
} }
if($reply =~ /Updated.*$h.*to.*$ip/) { if($reply =~ /Updated.*$h.*to.*$ip/) {
$config{$h}{'ip'} = $ip; $config{$h}{'ip'} = $ip;
$config{$h}{'mtime'} = $now; $config{$h}{'mtime'} = $now;
$config{$h}{'status'} = 'good'; $config{$h}{'status'} = 'good';
success("updating %s: good: IP address set to %s", $h, $ip); success("updating %s: good: IP address set to %s", $h, $ip);
} else { } elsif ($reply =~ /Address .* has not changed/) {
$config{$h}{'status'} = 'failed'; success("updating %s: good: IP address has not changed", $h, $ip);
warning("SENT: %s", $freedns_hosts{$h}->[2]) unless opt('verbose'); } else {
warning("REPLIED: %s", $reply); $config{$h}{'status'} = 'failed';
failed("updating %s: Invalid reply.", $h); warning("SENT: %s", $freedns_hosts{$h}->[2]) unless opt('verbose');
} warning("REPLIED: %s", $reply);
} failed("updating %s: Invalid reply.", $h);
}
}
} }
} }