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

Merge pull request #194 from rhansen/ip-extract

Browse source 
Rename `ipv4_match`, `ipv6_match` to `ipv4_extract`, `ipv6_extract`
This commit is contained in:
Richard Hansen 2020-06-28 17:14:17 -04:00 committed by GitHub
commit 959c7154ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ddclient
View file

@ -949,7 +949,7 @@ sub update_nics {
next; next;
} }
if (!is_ipv4($ip)) { if (!is_ipv4($ip)) {
if (!ipv6_match($ip)) { if (!extract_ipv6($ip)) {
warning("malformed IP address (%s)", $ip); warning("malformed IP address (%s)", $ip);
next; next;
} }
@ -1900,7 +1900,7 @@ sub check_value {
return undef if $value eq ""; return undef if $value eq "";
} elsif ($type eq T_IP) { } elsif ($type eq T_IP) {
if (!ipv6_match($value)) { if (!extract_ipv6($value)) {
return undef if !is_ipv4($value); return undef if !is_ipv4($value);
} }
} }
@ -2282,9 +2282,9 @@ sub get_ip {
} }
if (defined($ip)) { if (defined($ip)) {
# no need to parse $reply # no need to parse $reply
} elsif ($ip = ipv4_match($reply)) { } elsif ($ip = extract_ipv4($reply)) {
$ip = un_zero_pad($ip); $ip = un_zero_pad($ip);
} elsif ($ip = ipv6_match($reply)) { } elsif ($ip = extract_ipv6($reply)) {
$ip = un_zero_pad($ip); $ip = un_zero_pad($ip);
} else { } else {
warning("found neither ipv4 nor ipv6 address"); warning("found neither ipv4 nor ipv6 address");
@ -2303,13 +2303,13 @@ sub get_ip {
###################################################################### ######################################################################
sub is_ipv4 { sub is_ipv4 {
my ($value) = @_; my ($value) = @_;
return (length($value // '') != 0) && ($value eq (ipv4_match($value) // '')); return (length($value // '') != 0) && ($value eq (extract_ipv4($value) // ''));
} }
###################################################################### ######################################################################
## ipv4_match() extracts the first valid IPv4 address from given string ## extract_ipv4() extracts the first valid IPv4 address from the given string
###################################################################### ######################################################################
sub ipv4_match { sub extract_ipv4 {
(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; (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; return $1;
} }
@ -2324,9 +2324,9 @@ sub is_ipv6 {
} }
###################################################################### ######################################################################
## ipv6_match determine ipv6 address from given string and return them ## extract_ipv6() extracts the first valid IPv6 address from the given string
###################################################################### ######################################################################
sub ipv6_match { sub extract_ipv6 {
my $content = shift; my $content = shift;
my $omits; my $omits;
my $ip = ""; my $ip = "";