X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=fd47a28a2860afa87f393bc2bc4e309793076272;hb=586cbb347e7639f5575b48572e75140501a109c0;hp=455311e3fceac64163d920ceeb508111cafa52d7;hpb=5b602b76c1409d411a4dc51babc207a7cc241513;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 455311e3..fd47a28a 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,12 +598,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" );
@@ -1143,7 +1148,6 @@ sub finish
 {
 	my $self = shift;
 	my $call = $self->call;
-	my $conn = shift;
 	my $ref = DXCluster->get_exact($call);
 	
 	# unbusy and stop and outgoing mail