projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e0adb94
)
fix problems with empty/corrupt filters
author
minima
<minima>
Mon, 9 Oct 2006 15:01:40 +0000
(15:01 +0000)
committer
minima
<minima>
Mon, 9 Oct 2006 15:01:40 +0000
(15:01 +0000)
Changes
patch
|
blob
|
history
perl/Filter.pm
patch
|
blob
|
history
diff --git
a/Changes
b/Changes
index 9e9106dc68990ea59c01f5134165cfcfcf7a0fb7..00e5fb9c8dac74cedf1de26810b2772b773c8588 100644
(file)
--- a/
Changes
+++ b/
Changes
@@
-1,3
+1,5
@@
+09Oct06=======================================================================
+1. fix problems with bad filters pointed by Thomas DL3SBB.
27Jul06=======================================================================
1. merge in official issue version of wpxloc.raw (with one change: 4U1V).
26Jul06=======================================================================
27Jul06=======================================================================
1. merge in official issue version of wpxloc.raw (with one change: 4U1V).
26Jul06=======================================================================
diff --git
a/perl/Filter.pm
b/perl/Filter.pm
index 74f74d444dbc2ab34610071e1b8acb25d39e71cc..3009883b66f3a967665b46cc09e4b8310f5ff354 100644
(file)
--- a/
perl/Filter.pm
+++ b/
perl/Filter.pm
@@
-35,8
+35,10
@@
use Prefix;
use strict;
use vars qw($VERSION $BRANCH);
use strict;
use vars qw($VERSION $BRANCH);
-
-main::mkver($VERSION = q$Revision$);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
+$main::build += $VERSION;
+$main::branch += $BRANCH;
use vars qw ($filterbasefn $in);
use vars qw ($filterbasefn $in);
@@
-114,17
+116,25
@@
sub read_in
$in = undef;
my $s = readfilestr($fn);
my $newin = eval $s;
$in = undef;
my $s = readfilestr($fn);
my $newin = eval $s;
- dbg($@) if $@;
+ if ($@) {
+ dbg($@);
+ unlink($fn);
+ return undef;
+ }
if ($in) {
$newin = new('Filter::Old', $sort, $call, $flag);
$newin->{filter} = $in;
if ($in) {
$newin = new('Filter::Old', $sort, $call, $flag);
$newin->{filter} = $in;
- } els
e
{
+ } els
if (ref $newin && $newin->can('getfilkeys'))
{
my $filter;
my $key;
foreach $key ($newin->getfilkeys) {
$newin->compile($key, 'reject');
$newin->compile($key, 'accept');
}
my $filter;
my $key;
foreach $key ($newin->getfilkeys) {
$newin->compile($key, 'reject');
$newin->compile($key, 'accept');
}
+ } else {
+ # error on reading file, delete and exit
+ unlink($fn);
+ return undef;
}
return $newin;
}
}
return $newin;
}
@@
-196,7
+206,6
@@
sub it
my $key;
my $type = 'Dunno';
my $asc = '?';
my $key;
my $type = 'Dunno';
my $asc = '?';
- my $data = ref $_[0] ? shift : \@_;
my $r = @keys > 0 ? 0 : 1;
foreach $key (@keys) {
my $r = @keys > 0 ? 0 : 1;
foreach $key (@keys) {
@@
-204,7
+213,7
@@
sub it
if ($filter->{reject} && exists $filter->{reject}->{code}) {
$type = 'reject';
$asc = $filter->{reject}->{user};
if ($filter->{reject} && exists $filter->{reject}->{code}) {
$type = 'reject';
$asc = $filter->{reject}->{user};
- if (&{$filter->{reject}->{code}}(
$data
)) {
+ if (&{$filter->{reject}->{code}}(
\@_
)) {
$r = 0;
last;
} else {
$r = 0;
last;
} else {
@@
-214,7
+223,7
@@
sub it
if ($filter->{accept} && exists $filter->{accept}->{code}) {
$type = 'accept';
$asc = $filter->{accept}->{user};
if ($filter->{accept} && exists $filter->{accept}->{code}) {
$type = 'accept';
$asc = $filter->{accept}->{user};
- if (&{$filter->{accept}->{code}}(
$data
)) {
+ if (&{$filter->{accept}->{code}}(
\@_
)) {
$r = 1;
last;
} else {
$r = 1;
last;
} else {
@@
-227,7
+236,7
@@
sub it
my $hops = $self->{hops} if exists $self->{hops};
if (isdbg('filter')) {
my $hops = $self->{hops} if exists $self->{hops};
if (isdbg('filter')) {
- my $args = join '\',\'', map {defined $_ ? $_ : 'undef'} @
$data
;
+ my $args = join '\',\'', map {defined $_ ? $_ : 'undef'} @
_
;
my $true = $r ? "OK " : "REJ";
my $sort = $self->{sort};
my $dir = $self->{name} =~ /^in_/i ? "IN " : "OUT";
my $true = $r ? "OK " : "REJ";
my $sort = $self->{sort};
my $dir = $self->{name} =~ /^in_/i ? "IN " : "OUT";
@@
-302,7
+311,7
@@
sub install
my $dxchan;
my @dxchan;
if ($name eq 'NODE_DEFAULT') {
my $dxchan;
my @dxchan;
if ($name eq 'NODE_DEFAULT') {
- @dxchan =
grep{$_->is_node || $_->is_aranea} DXChannel::get_all
();
+ @dxchan =
DXChannel::get_all_nodes
();
} elsif ($name eq 'USER_DEFAULT') {
@dxchan = DXChannel::get_all_users();
} else {
} elsif ($name eq 'USER_DEFAULT') {
@dxchan = DXChannel::get_all_users();
} else {