use Data::Dumper;
use Time::HiRes qw(gettimeofday tv_interval);
use Text::Wrap;
+use Socket qw(AF_INET6 AF_INET inet_pton);
use strict;
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;
+
+ if ($_[0] =~ /:/) {
+ if (inet_pton(AF_INET6, $_[0])) {
+ return ($_[0] =~ /([:0-9a-f]+)/);
+ }
+# use re 'debug';
+# return ($1) if $_[0] =~ /^(\:?(?:\:?[0-9a-f]{1,4}){1,8}?)$/i;
+# no re 'debug';
+ } else {
+ return ($_[0] =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/);
+ }
+ return undef;
}
# is it a zulu time hhmmZ
$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?' ':'');