Merge branch 'github'
This commit is contained in:
wimpunk
commit
747620cf66
3 changed files with 154 additions and 69 deletions
|
|
@ -42,8 +42,9 @@ REQUIREMENTS:
|
|||
- one or more accounts from one of the dynamic DNS services
|
||||
|
||||
- Perl 5.014 or later
|
||||
(you need the IO::Socket::SSL perl library for ssl-support
|
||||
and JSON::Any perl library for JSON support)
|
||||
(you need the IO::Socket::SSL perl library for ssl-support,
|
||||
JSON::Any perl library for JSON support and
|
||||
IO::Socket:INET6 perl library for ipv6-support)
|
||||
|
||||
- Linux or probably any common Unix system
|
||||
|
||||
|
|
|
|||
78
ddclient
78
ddclient
|
|
@ -345,7 +345,7 @@ my %variables = (
|
|||
'retry' => setv(T_BOOL, 0, 0, 0, 0, undef),
|
||||
'force' => setv(T_BOOL, 0, 0, 0, 0, undef),
|
||||
'ssl' => setv(T_BOOL, 0, 0, 0, 0, undef),
|
||||
|
||||
'ipv6' => setv(T_BOOL, 0, 0, 0, 0, undef),
|
||||
'syslog' => setv(T_BOOL, 0, 0, 1, 0, undef),
|
||||
'facility' => setv(T_STRING,0, 0, 1, 'daemon', undef),
|
||||
'priority' => setv(T_STRING,0, 0, 1, 'notice', undef),
|
||||
|
|
@ -380,7 +380,7 @@ my %variables = (
|
|||
'fw-password' => setv(T_PASSWD,0, 0, 1, '', undef),
|
||||
'cmd' => setv(T_PROG, 0, 0, 1, '', undef),
|
||||
'cmd-skip' => setv(T_STRING,0, 0, 1, '', undef),
|
||||
|
||||
'ipv6' => setv(T_BOOL, 0, 0, 0, 0, undef),
|
||||
'ip' => setv(T_IP, 0, 1, 0, undef, undef),
|
||||
'wtime' => setv(T_DELAY, 0, 1, 1, 0, interval('30s')),
|
||||
'mtime' => setv(T_NUMBER, 0, 1, 0, 0, undef),
|
||||
|
|
@ -437,6 +437,7 @@ my %variables = (
|
|||
'nsupdate-common-defaults' => {
|
||||
'ttl' => setv(T_NUMBER, 0, 1, 0, 600, undef),
|
||||
'zone' => setv(T_STRING, 1, 1, 1, '', undef),
|
||||
'tcp' => setv(T_BOOL, 0, 1, 1, 0, undef),
|
||||
},
|
||||
'cloudflare-common-defaults' => {
|
||||
'server' => setv(T_FQDNP, 1, 0, 1, 'www.cloudflare.com', undef),
|
||||
|
|
@ -729,6 +730,7 @@ my @opt = (
|
|||
[ "debug", "!", "-{no}debug : print {no} debugging information" ],
|
||||
[ "verbose", "!", "-{no}verbose : print {no} verbose information" ],
|
||||
[ "quiet", "!", "-{no}quiet : print {no} messages for unnecessary updates" ],
|
||||
[ "ipv6", "!", "-{no}ipv6 : use ipv6" ],
|
||||
[ "help", "", "-help : this message" ],
|
||||
[ "postscript", "", "-postscript : script to run after updating ddclient, has new IP as param" ],
|
||||
|
||||
|
|
@ -903,8 +905,10 @@ sub update_nics {
|
|||
next;
|
||||
}
|
||||
if ($ip !~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) {
|
||||
if( !ipv6_match($ip) ) {
|
||||
warning("malformed IP address (%s)", $ip);
|
||||
next;
|
||||
}
|
||||
}
|
||||
$iplist{$use}{$arg_ip}{$arg_fw}{$arg_if}{$arg_web}{$arg_cmd} = $ip;
|
||||
}
|
||||
|
|
@ -1046,7 +1050,7 @@ sub parse_assignment {
|
|||
my ($c, $name, $value);
|
||||
my ($escape, $quote) = (0, '');
|
||||
|
||||
if ($rest =~ /^\s*([a-z][a-z_-]*)=(.*)/i) {
|
||||
if ($rest =~ /^\s*([a-z][0-9a-z_-]*)=(.*)/i) {
|
||||
($name, $rest, $value) = ($1, $2, '');
|
||||
|
||||
while (length($c = substr($rest,0,1))) {
|
||||
|
|
@ -1850,8 +1854,10 @@ sub check_value {
|
|||
# return undef if $value =~ /:/;
|
||||
|
||||
} elsif ($type eq T_IP) {
|
||||
if( !ipv6_match($value) ) {
|
||||
return undef if $value !~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/;
|
||||
}
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
######################################################################
|
||||
|
|
@ -1889,6 +1895,24 @@ EOM
|
|||
import IO::Socket::SSL;
|
||||
{ no warnings; $IO::Socket::SSL::DEBUG = 0; }
|
||||
}
|
||||
|
||||
######################################################################
|
||||
## load_ipv6_support
|
||||
######################################################################
|
||||
sub load_ipv6_support {
|
||||
my $ipv6_loaded = eval {require IO::Socket::INET6};
|
||||
unless ($ipv6_loaded) {
|
||||
fatal(<<"EOM");
|
||||
Error loading the Perl module IO::Socket::INET6 needed for ipv6 connect.
|
||||
On Debian, the package libio-socket-inet6-perl must be installed.
|
||||
On Red Hat, the package perl-IO-Socket-INET6 must be installed.
|
||||
On Alpine, the package perl-io-socket-inet6 must be installed.
|
||||
EOM
|
||||
}
|
||||
import IO::Socket::INET6;
|
||||
{ no warnings; $IO::Socket::INET6::DEBUG = 0; }
|
||||
}
|
||||
|
||||
######################################################################
|
||||
## load_sha1_support
|
||||
######################################################################
|
||||
|
|
@ -1995,6 +2019,16 @@ sub geturl {
|
|||
Timeout => opt('timeout'),
|
||||
);
|
||||
defined $sd or warning("cannot connect to $peer:$port socket: $@ " . IO::Socket::SSL::errstr());
|
||||
} elsif ($globals{'ipv6'}) {
|
||||
load_ipv6_support;
|
||||
$sd = IO::Socket::INET6->new(
|
||||
PeerAddr => $peer,
|
||||
PeerPort => $port,
|
||||
Proto => 'tcp',
|
||||
MultiHomed => 1,
|
||||
Timeout => opt('timeout'),
|
||||
);
|
||||
defined $sd or warning("cannot connect to $peer:$port socket: $@");
|
||||
} else {
|
||||
$sd = IO::Socket::INET->new(
|
||||
PeerAddr => $peer,
|
||||
|
|
@ -2195,6 +2229,11 @@ sub get_ip {
|
|||
$ip = $1;
|
||||
$ip = un_zero_pad($ip);
|
||||
$ip = filter_local($ip) if opt('fw-banlocal', $h);
|
||||
} elsif ( $ip = ipv6_match($reply) ) {
|
||||
$ip = un_zero_pad($ip);
|
||||
$ip = filter_local($ip) if opt('fw-banlocal', $h);
|
||||
} else {
|
||||
warning("found neither ipv4 nor ipv6 address");
|
||||
}
|
||||
if (($use ne 'ip') && (define($ip,'') eq '0.0.0.0')) {
|
||||
$ip = undef;
|
||||
|
|
@ -2204,6 +2243,34 @@ sub get_ip {
|
|||
return $ip;
|
||||
}
|
||||
|
||||
######################################################################
|
||||
## ipv6_match determine ipv6 address from given string and return them
|
||||
######################################################################
|
||||
sub ipv6_match {
|
||||
my $content = shift;
|
||||
my $omits;
|
||||
my $ip = "";
|
||||
my $linenumbers = 0;
|
||||
|
||||
my @values = split('\n', $content);
|
||||
foreach my $val (@values) {
|
||||
next unless $val =~ /((:{0,2}[A-F0-9]{1,4}){0,7}:{1,2}[A-F0-9]{1,4})/ai; # invalid char
|
||||
my $parsed = $1;
|
||||
|
||||
# check for at least 7 colons
|
||||
my $count_colon = () = $parsed =~ /:/g;
|
||||
if ($count_colon != 7) {
|
||||
# or one double colon
|
||||
my $count_double_colon = () = $parsed =~ /::/g;
|
||||
if ($count_double_colon != 1) {
|
||||
next
|
||||
}
|
||||
}
|
||||
return $parsed;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
######################################################################
|
||||
## group_hosts_by
|
||||
######################################################################
|
||||
|
|
@ -4022,6 +4089,10 @@ Configuration variables applicable to the 'nsupdate' protocol are:
|
|||
zone=dyn.example.com ## forward zone that is to be updated
|
||||
ttl=600 ## time to live of the record;
|
||||
## defaults to 600 seconds
|
||||
tcp=off|on ## nsupdate uses UDP by default, and switches to
|
||||
## TCP if the update is too large to fit in a
|
||||
## UDP datagram; this setting forces TCP;
|
||||
## defaults to off
|
||||
login=/usr/bin/nsupdate ## path and name of nsupdate binary;
|
||||
## defaults to '/usr/bin/nsupdate'
|
||||
<hostname> ## fully qualified hostname to update
|
||||
|
|
@ -4078,6 +4149,7 @@ EoINSTR2
|
|||
send
|
||||
EoINSTR3
|
||||
my $command = "$binary -k $keyfile";
|
||||
$command .= " -v" if ynu($config{$h}{'tcp'}, 1, 0, 0);
|
||||
$command .= " -d" if (opt('debug'));
|
||||
verbose("UPDATE:", "nsupdate command is: %s", $command);
|
||||
verbose("UPDATE:", "nsupdate instructions are:\n%s", $instructions);
|
||||
|
|
|
|||
|
|
@ -221,3 +221,15 @@ ssl=yes # use ssl-support. Works with
|
|||
# password=my-auto-generated-password
|
||||
# protocol=duckdns hostwithoutduckdnsorg
|
||||
|
||||
##
|
||||
## MyOnlinePortal (http://myonlineportal.net)
|
||||
##
|
||||
# protocol=dyndns2
|
||||
# ssl=yes
|
||||
# # ipv6=yes # optional
|
||||
# use=web, web=myonlineportal.net/checkip
|
||||
# # use=if, if=eth0 # alternative to use=web
|
||||
# # if-skip=Scope:Link # alternative to use=web
|
||||
# login=your-myonlineportal-username
|
||||
# password=your-myonlineportal-password
|
||||
# domain.myonlineportal.net
|
||||
|
|
|
|||
Loading…
Reference in a new issue