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

Add is_ipv4() and ipv4_match() functions

Browse source
This commit is contained in:
David Kerr 2020-06-21 16:20:13 -04:00 committed by Richard Hansen
parent aeba95aef4
commit 0caed7ca2a
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ddclient
View file

@ -949,7 +949,7 @@ sub update_nics {
if !$daemon || opt('verbose'); if !$daemon || opt('verbose');
next; next;
} }
if ($ip !~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) { if (!is_ipv4($ip)) {
if (!ipv6_match($ip)) { if (!ipv6_match($ip)) {
warning("malformed IP address (%s)", $ip); warning("malformed IP address (%s)", $ip);
next; next;
@ -1901,7 +1901,7 @@ sub check_value {
} elsif ($type eq T_IP) { } elsif ($type eq T_IP) {
if (!ipv6_match($value)) { if (!ipv6_match($value)) {
return undef if $value !~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/; return undef if !is_ipv4($value);
} }
} }
return $value; return $value;
@ -2289,8 +2289,7 @@ sub get_ip {
} }
if (defined($ip)) { if (defined($ip)) {
# no need to parse $reply # no need to parse $reply
} elsif ($reply =~ /^.*?\b(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\b.*/is) { } elsif ($ip = ipv4_match($reply)) {
$ip = $1;
$ip = un_zero_pad($ip); $ip = un_zero_pad($ip);
$ip = filter_local($ip) if opt('fw-banlocal', $h); $ip = filter_local($ip) if opt('fw-banlocal', $h);
} elsif ($ip = ipv6_match($reply)) { } elsif ($ip = ipv6_match($reply)) {
@ -2307,6 +2306,23 @@ sub get_ip {
return $ip; return $ip;
} }
######################################################################
## is_ipv4() validates if string is valid IPv4 address and only
## a valid IPv4 address (no preceding or trailing spaces/characters)
######################################################################
sub is_ipv4 {
my ($value) = @_;
return (length($value // '') != 0) && ($value eq (ipv4_match($value) // ''));
}
######################################################################
## ipv4_match() extracts the first valid IPv4 address from given string
######################################################################
sub ipv4_match {
(shift // '') =~ /\b((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))\b/ai;
return $1;
}
###################################################################### ######################################################################
## is_ipv6() validates if string is valid IPv6 address ## is_ipv6() validates if string is valid IPv6 address
###################################################################### ######################################################################