X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=f429c7ce93196e09ede58025bdb7b8b5b2808d2a;hb=956e3acab807900fdbccc0e2fa5e999327a1c1ce;hp=db342dfb028c5b0dd57d9fc6415024f167f2821b;hpb=c20a2c1e01d707d6c3fa25067df93d491aba8fff;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index db342dfb..f429c7ce 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -70,7 +70,7 @@ $baddxfn = "$main::data/baddx.pl";
  [ qw(c c n n) ],				# pc25
  [ qw(f m d t m c c bc) ],		# pc26
  [ qw(d n n n n m c c bc) ],	# pc27
- [ qw(c c c c d t p m bp n p bp bc) ], # pc28
+ [ qw(c c m c d t p m bp n p bp bc) ], # pc28
  [ qw(c c n m) ],				# pc29
  [ qw(c c n) ],					# pc30
  [ qw(c c n) ],					# pc31
@@ -212,14 +212,14 @@ sub start
 	$self->{here} = 1;
 
 	# get the output filters
-	$self->{spotfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0);
+	$self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0);
 	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'node_default', 0);
 	$self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'node_default', 0);
 	$self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'node_default', 0) ;
 
 
 	# get the INPUT filters (these only pertain to Clusters)
-	$self->{inspotfilter} = Filter::read_in('spots', $call, 1) || Filter::read_in('spots', 'node_default', 1);
+	$self->{inspotsfilter} = Filter::read_in('spots', $call, 1) || Filter::read_in('spots', 'node_default', 1);
 	$self->{inwwvfilter} = Filter::read_in('wwv', $call, 1) || Filter::read_in('wwv', 'node_default', 1);
 	$self->{inwcyfilter} = Filter::read_in('wcy', $call, 1) || Filter::read_in('wcy', 'node_default', 1);
 	$self->{inannfilter} = Filter::read_in('ann', $call, 1) || Filter::read_in('ann', 'node_default', 1);
@@ -1138,8 +1138,8 @@ sub send_dx_spot
 		my $routeit;
 		my ($filter, $hops);
 
-		if ($dxchan->{spotfilter}) {
-		    ($filter, $hops) = $dxchan->{spotfilter}->it(@_, $self->{call} );
+		if ($dxchan->{spotsfilter}) {
+		    ($filter, $hops) = $dxchan->{spotsfilter}->it(@_, $self->{call} );
 			next unless $filter;
 		}
 		
@@ -1231,7 +1231,7 @@ sub send_wcy_spot
 			 ($filter, $hops) = $dxchan->{wcyfilter}->it(@_, $self->{call} );
 			 next unless $filter;
 		}
-		if ($dxchan->is_clx || $dxchan->is_spider) {
+		if ($dxchan->is_clx || $dxchan->is_spider || $dxchan->is_dxnet) {
 			next if $dxchan == $self;
 			if ($hops) {
 				$routeit = $line;
@@ -1291,13 +1291,13 @@ sub send_announce
 
 		if ($dxchan->{annfilter}) {
 			my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-			my @dxcc = Prefix::extract($_[1]);
+			my @dxcc = Prefix::extract($_[0]);
 			if (@dxcc > 0) {
 				$ann_dxcc = $dxcc[1]->dxcc;
 				$ann_itu = $dxcc[1]->itu;
 				$ann_cq = $dxcc[1]->cq;						
 			}
-			@dxcc = Prefix::extract($_[5]);
+			@dxcc = Prefix::extract($_[4]);
 			if (@dxcc > 0) {
 				$org_dxcc = $dxcc[1]->dxcc;
 				$org_itu = $dxcc[1]->itu;
@@ -1473,7 +1473,7 @@ sub broadcast_list
 		
 		if ($sort eq 'dx') {
 		    next unless $dxchan->{dx};
-			($filter) = $dxchan->{spotfilter}->it(@{$fref}) if ref $fref;
+			($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref;
 			next unless $filter;
 		}
 		next if $sort eq 'ann' && !$dxchan->{ann};