X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=516779b67458791266a7d00bd25453d30732b1ad;hb=4a8336156c820698be4933a3e36513750709926d;hp=6f4b089dd1841835bedd320f8b0b979e0c98a5b6;hpb=25a3f1e8b4643da0befe759bcd2f4b99b01da909;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 6f4b089d..516779b6 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -236,13 +236,10 @@ sub start # send initialisation string unless ($self->{outbound}) { -# $self->send(pc38()) if DXNode->get_all(); $self->send(pc18()); $self->{lastping} = $main::systime; } else { - # remove from outstanding connects queue - @main::outstanding_connects = grep {$_->{call} ne $call} @main::outstanding_connects; - $self->{lastping} = $main::systime + $self->pingint / 2; + $self->{lastping} = $main::systime + ($self->pingint / 2); } $self->state('init'); $self->pc50_t(time); @@ -358,6 +355,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,7 +598,7 @@ sub normal dbg('chan', "PCPROT: $field[2] came in on wrong channel"); return; } - if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) { + if ($dxchan = DXChannel->get($field[1])) { dbg('chan', "PCPROT: $field[1] connected locally"); return; }