X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FDx.pm;h=c4d969a03aceedab799905c57c1a7b35d725fce3;hb=393e17fd3a08dd94596f1c02d4d20f6f9a44954f;hp=10eee308fd035c6fdf33170b9df1c84695bab41d;hpb=56acf117e704090501056412d10b62664ed94825;p=spider.git

diff --git a/perl/Thingy/Dx.pm b/perl/Thingy/Dx.pm
index 10eee308..c4d969a0 100644
--- a/perl/Thingy/Dx.pm
+++ b/perl/Thingy/Dx.pm
@@ -11,10 +11,8 @@ use strict;
 package Thingy::Dx;
 
 use vars qw($VERSION $BRANCH);
-$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;
+
+main::mkver($VERSION = q$Revision$);
 
 use DXChannel;
 use DXDebug;
@@ -142,11 +140,11 @@ sub out_filter
 	my $thing = shift;
 	my $dxchan = shift;
 	
-	# global spot filtering on INPUT
-	if ($dxchan->{inspotsfilter}) {
-		my ($filter, $hops) = $dxchan->{inspotsfilter}->it($thing->{spotdata});
+	# global spot filtering on OUTPUT
+	if ($dxchan->{spotsfilter}) {
+		my ($filter, $hops) = $dxchan->{spotsfilter}->it($thing->{spotdata});
 		unless ($filter) {
-			dbg("PCPROT: Rejected by input spot filter") if isdbg('chanerr');
+			dbg("PCPROT: Rejected by output spot filter") if isdbg('chanerr');
 			return;
 		}
 		$thing->{hops} = $hops if $hops;