fix DXCIDR inet_pton calls

diff --git a/cmd/show/badip.pl b/cmd/show/badip.pl
index 475abde165e2856454874dcc5147be223868a916..b378abde47e08a89f63a0e20e2376460fa4af5c8 100644 (file)
--- a/cmd/show/badip.pl
+++ b/cmd/show/badip.pl
@@ -14,7 +14,7 @@ my @added;
 my @in = split /\s+/, $line;
 my $maxlth = 0;
 
-$DB::single = 1;
+#$DB::single = 1;
 
 
 my @list = map {my $s = $_; $s =~ s|/32$||; $maxlth = length $s if length $s > $maxlth; $s =~ /^1$/?undef:$s} DXCIDR::list();

diff --git a/perl/DXCIDR.pm b/perl/DXCIDR.pm
index 506b9693ed9e54c49f2d8d3425ba4c2e62c7f10e..230920f97be01ebd77a8db69b052a9d01770e4d6 100644 (file)
--- a/perl/DXCIDR.pm
+++ b/perl/DXCIDR.pm
@@ -16,7 +16,7 @@ use DXUtil;
 use DXLog;
 use IO::File;
 use File::Copy;
-use Socket qw(inet_pton inet_ntop);
+use Socket qw(AF_INET AF_INET6 inet_pton inet_ntop);
 
 our $active = 0;
 our $badipfn = "badip";
@@ -128,7 +128,7 @@ sub _sort
        my @in;
        my @out;
        for (@_) {
-               push @in, [inet_pton($_), split m|/|];
+               push @in, [inet_pton(m|:|?AF_INET6:AF_INET, $_), split m|/|];
        }
        @out = sort {$a->[0] <=> $b->[0]} @in;
        return map { "$_->[1]/$_->[2]"} @out;