use Data::Dumper;
use Time::HiRes qw(gettimeofday tv_interval);
use Text::Wrap;
+use Socket qw(AF_INET6 AF_INET inet_pton);
use strict;
is_qra is_freq is_digits is_pctext is_pcflag insertitem deleteitem
is_prefix dd is_ipaddr $pi $d2r $r2d localdata localdata_mv
diffms _diffms _diffus difft parraydifft is_ztime basecall
- normalise_call
+ normalise_call is_numeric
);
$d2r = ($pi/180);
$r2d = (180/$pi);
+our $ptonok;
+
+BEGIN {
+ $ptonok = !defined inet_pton(AF_INET, '016.17.184.1')
+ && !defined inet_pton(AF_INET6, '2067::1:')
+ # Some old versions of Socket are hopelessly broken
+ && length(inet_pton(AF_INET, '1.1.1.1')) == 4;
+}
# a full time for logging and other purposes
sub atime
my $ref = shift;
my $out;
- while (my $k = sort keys %$ref) {
+ foreach my $k (sort keys %$ref) {
$out .= "${k}=>$ref->{$k}, ";
}
$out =~ s/, $// if $out;
sub unpad
{
my $s = shift;
- $s =~ s/\s+$//;
- $s =~ s/^\s+//;
+ $s =~ s/^\s*//;
+ $s =~ s/\s*$//;
return $s;
}
# is it an ip address?
sub is_ipaddr
{
- return $_[0] =~ /^\d+\.\d+\.\d+\.\d+$/ || $_[0] =~ /^[0-9a-f:,]+$/;
+ if ($ptonok) {
+ if ($_[0] =~ /:/) {
+ if (inet_pton(AF_INET6, $_[0])) {
+ return ($_[0] =~ /([:0-9a-f]+)/);
+ }
+ } else {
+ if (inet_pton(AF_INET, $_[0])) {
+ return ($_[0] =~ /([\.\d]+)/);
+ }
+ }
+ } else {
+ if ($_[0] =~ /:/) {
+ return ($_[0] =~ /^(:?:?(?:[0-9a-f]{1,4}\:)?(?:\:[0-9a-f]{1,4}(?:\:\:)?){1,8})$/i);
+ } else {
+ return ($_[0] =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/);
+ }
+ }
+ return undef;
}
# is it a zulu time hhmmZ
sub difft
{
my $b = shift;
- my $adds = shift;
+ my $adds = shift // 0;
my $t;
if (ref $b eq 'ARRAY') {
$t -= $h * 3600;
$m = int $t / 60;
$out .= sprintf ("%s${m}m", $adds?' ':'') if $m;
- if ($d == 0 && $adds || $adds == 2) {
+ if (($d == 0 && $adds) || (int $adds && $adds == 2)) {
$s = int $t % 60;
$out .= sprintf ("%s${s}s", $adds?' ':'') if $s;
$out ||= sprintf ("%s0s", $adds?' ':'');
$ncall .= "-$ssid" if $ssid;
return $ncall;
}
+
+sub is_numeric
+{
+ return $_[0] =~ /^[\.\d]+$/;
+}