$fn .= ".$suffix" if $suffix;
my $fh = IO::File->new($fn);
my @out;
+ my $ecount;
+ my $line;
+
if ($fh) {
while (<$fh>) {
chomp;
+ ++$line;
next if /^\s*\#/;
next unless /[\.:]/;
+ next unless $_;
+ unless (is_ipaddr($_)) {
+ ++$ecount;
+ LogDbg('err', qq(DXCIDR: $fn line $line: '$_' not an ip address));
+ if ($ecount > 10) {
+ LogDbg('err', qq(DXCIDR: More than 10 errors in $fn at/after line $line: '$_' - INVALID INPUT FILE));
+ return ();
+ }
+ }
push @out, $_;
}
$fh->close;
{
my $suffix = shift;
my @in = _read($suffix);
+ return 0 unless @in;
return scalar add(@in);
}
sub append
{
+ return 0 unless $active;
+
my $suffix = shift;
my @in = @_;
my @out;
if ($suffix) {
my $fn = _fn() . ".$suffix";
- my $r = rand;
- my $fh = IO::File->new (">>$fn.$r");
- if ($fh) {
+ my $fh = IO::File->new;
+ if ($fh->open("$fn", "a+")) {
+ $fh->seek(0, 2); # belt and braces !!
print $fh "$_\n" for @in;
$fh->close;
- move "$fn.$r", $fn;
} else {
- LogDbg('err', "DXCIDR::append error appending to $fn.$r $!");
+ LogDbg('err', "DXCIDR::append error appending to $fn $!");
}
} else {
LogDbg('err', "DXCIDR::append require badip suffix");
sub add
{
+ return 0 unless $active;
my $count = 0;
for my $ip (@_) {
# protect against stupid or malicious
+ next unless is_ipaddr($ip);
next if $ip =~ /^127\./;
next if $ip =~ /^::1$/;
if ($ip =~ /\./) {
sub clean_prep
{
+ return unless $active;
+
if ($ipv4 && $count4) {
$ipv4->clean;
$ipv4->prep_find;
sub list
{
+ return () unless $active;
my @out;
push @out, $ipv4->list if $count4;
push @out, $ipv6->list if $count6;
sub reload
{
+ return 0 unless $active;
+
new();
- my $count = _load('base');
- $count += _load('local');
+ my $count = 0;
+ my $files = 0;
+
+ LogDbg('DXProt', "DXCIDR::reload reload database" );
- LogDbg('DXProt', "DXCIDR::reload $count ip addresses found (IPV4: $count4 IPV6: $count6)" );
+ my $dir;
+ opendir($dir, $main::local_data);
+ while (my $fn = readdir $dir) {
+ next unless my ($suffix) = $fn =~ /^badip\.(\w+)$/;
+ my $c = _load($suffix);
+ LogDbg('DXProt', "DXCIDR::reload: $fn read containing $c ip addresses" );
+ $count += $c;
+ $files++;
+ }
+ closedir $dir;
+
+ LogDbg('DXProt', "DXCIDR::reload $count ip addresses found (IPV4: $count4 IPV6: $count6) in $files badip files" );
return $count;
}
sub new
{
+ return 0 unless $active;
+
$ipv4 = Net::CIDR::Lite->new;
$ipv6 = Net::CIDR::Lite->new;
$count4 = $count6 = 0;