use Data::Dumper;
use Time::HiRes qw(gettimeofday tv_interval);
use Text::Wrap;
-
use strict;
use vars qw(@month %patmap $pi $d2r $r2d @ISA @EXPORT);
$r2d = (180/$pi);
+# BEGIN {
+# our $enable_ptonok = 0;
+# our $ptonok;
+
+
+# if ($enable_ptonok && !$main::is_win) {
+# eval {require Socket; Socket->import(qw(AF_INET6 AF_INET inet_pton)); };
+# unless ($@) {
+# $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
{
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-9a-f]{1,4}\:)?(?:\:[0-9a-f]{1,4}){1,6}$/i;
+ $_[0] =~ s|/\d+$||;
+ # 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]{0,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?' ':'');
{
return $_[0] =~ /^[\.\d]+$/;
}
+
+1;