X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=f429c7ce93196e09ede58025bdb7b8b5b2808d2a;hb=2bd682330ce9b04c95ddf05715cfb643da2df0ea;hp=9c7064d21cdfd3a0d943eb970b3a0bdf87423ab0;hpb=211b54d504170a8c9dad2bf25b9ed686d5eeac11;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 9c7064d2..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 m 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
@@ -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;