X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=5bf0d1f935f367fe3dfdc110b3986706bc90a0be;hb=be587fd8dade028c10545ffff4be13b0a18f3f91;hp=c9afde2b5593dcc3cc196d1107f88c0fdb5a7278;hpb=af429076bc146a50e631f28a50cc8df100cf2dbb;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index c9afde2b..5bf0d1f9 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1234,6 +1234,16 @@ sub handle_23
 		dbg("PCPROT: WWV Date ($_[1] $_[2]) out of range") if isdbg('chanerr');
 		return;
 	}
+
+	# global wwv filtering on INPUT
+	my @dxcc = ((Prefix::cty_data($_[6]))[0..2], (Prefix::cty_data($_[7]))[0..2]);
+	if ($self->{inwwvfilter}) {
+		my ($filter, $hops) = $self->{inwwvfilter}->it(@_[7,8], $origin, @dxcc);
+		unless ($filter) {
+			dbg("PCPROT: Rejected by input spot filter") if isdbg('chanerr');
+			return;
+		}
+	}
 	if (Geomag::dup($d,$sfi,$k,$i,$_[6])) {
 		dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chanerr');
 		return;
@@ -1839,7 +1849,7 @@ sub wwv
 	my ($filter, $hops);
 	
 	if ($self->{wwvfilter}) {
-		($filter, $hops) = $self->{wwvfilter}->it(@_);
+		($filter, $hops) = $self->{wwvfilter}->it(@_[7..$#_]);
 		return unless $filter;
 	}
 	send_prot_line($self, $filter, $hops, $isolate, $line)