X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCIDR.pm;h=680c66ddaa6fd29138d78143dfb5d46203059feb;hb=refs%2Fheads%2Fmojo;hp=b702d7b899c197f2647dd92da34d2efb3f502396;hpb=d3568fec5fb3e19f72dc4813dd2e18a7031dd6bb;p=spider.git

diff --git a/perl/DXCIDR.pm b/perl/DXCIDR.pm
index b702d7b8..680c66dd 100644
--- a/perl/DXCIDR.pm
+++ b/perl/DXCIDR.pm
@@ -68,6 +68,7 @@ sub _read
 
 sub _load
 {
+	return unless $active;
 	my $suffix = shift;
 	my @in = _read($suffix);
 	return 0 unless @in;
@@ -122,20 +123,30 @@ sub add
 {
 	return 0 unless $active;
 	my $count = 0;
+	my @out;
 	
 	for my $ip (@_) {
 		# protect against stupid or malicious
 		next unless is_ipaddr($ip);
 		next if $ip =~ /^127\./;
 		next if $ip =~ /^::1$/;
+#		next if find($ip);
 		if ($ip =~ /\./) {
-			$ipv4->add_any($ip);
-			++$count;
-			++$count4;
+			eval {$ipv4->add_any($ip)};
+			if ($@) {
+				push @out, $@;
+			} else {
+				++$count;
+				++$count4;
+			}
 		} elsif ($ip =~ /:/) {
-			$ipv6->add_any($ip);
-			++$count;
-			++$count6;
+			eval {$ipv6->add_any($ip)};
+			if ($@) {
+				push @out, $@;
+			} else {
+				++$count;
+				++$count6;
+			}
 		} else {
 			LogDbg('err', "DXCIDR::add non-ip address '$ip' read");
 		}
@@ -161,10 +172,27 @@ sub _sort
 {
 	my @in;
 	my @out;
-	for (@_) {
-		push @in, [inet_pton(m|:|?AF_INET6:AF_INET, $_), split m|/|];
+	my $c;
+	for my $i (@_) {
+		my @s;
+		
+		my @ip = split m|/|, $i;
+		if ($ip[0] =~ /:/) {
+			@s = map{$_ ? hex($_) : 0} split /:/, $ip[0];
+		} else {
+			@s = map{$_ ? $_+0 : 0} split /\./, $ip[0];
+		}
+		while (@s < 8) {
+			push @s, 0;
+		}
+#		my $s = pack "S*", reverse @s;
+		my $s = pack "n*", @s; 
+#		my $s = join ':', map {sprintf "%04d:", $_} @s;
+#		push @in, [inet_pton(m|:|?AF_INET6:AF_INET, $ip[0]), @ip];
+		push @in, [$s, @ip];
 	}
-	@out = sort {$a->[0] <=> $b->[0]} @in;
+	@out = sort {$a->[0] cmp $b->[0]} @in;
+#	@out = sort {$a->[0] <=> $b->[0]} @in;
 	return map { "$_->[1]/$_->[2]"} @out;
 }
 
@@ -196,7 +224,12 @@ sub init
 		return;
 	}
 
-	import Net::CIDR::Lite;
+	eval {import Net::CIDR::Lite };
+	if ($@) {
+		LogDbg('DXProt', "DXCIDR: import Net::CIDR::Lite error $@");
+		return;
+	}
+
 	$active = 1;
 
 	my $fn = _fn();