X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FFilter.pm;h=bf7ff65c18a24c82df8eb4c45e7c7e7695b2e04d;hb=3f58f5ebe86a749d9e1ab37f25b3e7c7255a1906;hp=fdc06d1ae87454d3f9a81772fd403c6c80e82c7e;hpb=10cd15ab627d2df5fbce79eb1388424051309f1a;p=spider.git

diff --git a/perl/Filter.pm b/perl/Filter.pm
index fdc06d1a..bf7ff65c 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -36,7 +36,7 @@ use strict;
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -226,7 +226,7 @@ sub it
 	my $hops = $self->{hops} if exists $self->{hops};
 
 	if (isdbg('filter')) {
-		my $args = join '\',\'', @_;
+		my $args = join '\',\'', map {defined $_ ? $_ : 'undef'} @_;
 		my $true = $r ? "OK " : "REJ";
 		my $sort = $self->{sort};
 		my $dir = $self->{name} =~ /^in_/i ? "IN " : "OUT";
@@ -310,8 +310,9 @@ sub install
 	}
 	foreach $dxchan (@dxchan) {
 		my $n = "$in$sort" . "filter";
+		my $i = $in ? 'IN_' : '';
 		my $ref = $dxchan->$n();
-		if (!$ref || ($ref && uc $ref->{name} eq "$name.PL")) {
+		if (!$ref || ($ref && uc $ref->{name} eq "$i$name.PL")) {
 			$dxchan->$n($remove ? undef : $self);
 		}
 	}
@@ -367,7 +368,7 @@ sub parse
 	my $user;
 	
 	# check the line for non legal characters
-	return ('ill', $dxchan->msg('e19')) if $line =~ /[^\s\w,_\-\*\/\(\)]/;
+	return ('ill', $dxchan->msg('e19')) if $line =~ /[^\s\w,_\-\*\/\(\)!]/;
 	
 	# add some spaces for ease of parsing
 	$line =~ s/([\(\)])/ $1 /g;
@@ -443,12 +444,16 @@ sub parse
 
 				if ($s) {
 					$s .= $conj ;
-					$s .= $not;
 					$user .= $conj;
-					$user .= $not;
 					$conj = ' && ';
-					$not = "";
 				}
+
+				if ($not) {
+					$s .= $not;
+					$user .= $not;
+					$not = '';
+				}
+
 				$user .= "$tok $val";
 				
 				my $fref;