X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=42eb6b86731395c8a7f7bc108016b225f41a44d2;hb=b0375778a3330147c3cee881856f9328a8541966;hp=455311e3fceac64163d920ceeb508111cafa52d7;hpb=5b602b76c1409d411a4dc51babc207a7cc241513;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 455311e3..42eb6b86 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -358,6 +358,10 @@ sub normal # do some de-duping $field[5] =~ s/^\s+//; # take any leading blanks off $field[2] = unpad($field[2]); # take off leading and trailing blanks from spotted callsign + if ($field[2] =~ /BUST\w*$/) { + dbg('chan', "PCPROT: useless 'BUSTED' spot"); + return; + } if (Spot::dup($field[1], $field[2], $d, $field[5])) { dbg('chan', "PCPROT: Duplicate Spot ignored\n"); return; @@ -597,12 +601,16 @@ sub normal dbg('chan', "PCPROT: $field[2] came in on wrong channel"); return; } - if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) { - dbg('chan', "PCPROT: $field[2] connected locally"); + if ($dxchan = DXChannel->get($field[1])) { + dbg('chan', "PCPROT: $field[1] connected locally"); return; } my $ref = DXCluster->get_exact($field[1]); if ($ref) { + if ($ref->mynode != $node) { + dbg('chan', "PCPROT: $field[1] came in from wrong node $field[2]"); + return; + } $ref->del; } else { dbg('chan', "PCPROT: $field[1] not known" );