X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=2677cb7ef56cb3a6df58876d2cbcccec314d793f;hb=112a95fceb1effe735e555bb93ecebd3383e515a;hp=c3a98ecd9c81c37784f73bb812988dedc8f11baf;hpb=be3846f8cab76d9b7397d2306d5b94a5040ee918;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index c3a98ecd..2677cb7e 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,7 +355,7 @@ 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|BUSTED$/) {
+			if ($field[2] =~ /BUST\w*$/) {
 				dbg('chan', "PCPROT: useless 'BUSTED' spot");
 				return;
 			}
@@ -1151,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
@@ -1159,13 +1155,12 @@ sub finish
 	$mref->stop_msg($call) if $mref;
 	
 	# broadcast to all other nodes that all the nodes connected to via me are gone
-	my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();
+	my @gonenodes = grep { $_->dxchan != $self && $_->dxchan != $me } DXNode::get_all();
 	my $node;
 	
-	foreach $node (@gonenodes) {
-		next if $node->call eq $call;
-		broadcast_ak1a(pc21($node->call, 'Gone') , $self) unless $self->{isolate}; 
-		$node->del();
+	foreach my $dxchan (DXChannel::get_all_nodes) {
+		next if $dxchan == $self || $dxchan == $me;
+		broadcast_ak1a(pc21($dxchan->call, 'Gone') , $self) unless $self->{isolate}; 
 	}
 
 	# remove outstanding pings
@@ -1517,6 +1512,8 @@ sub broadcast_ak1a
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	foreach $dxchan (@dxchan) {
 		next if grep $dxchan == $_, @except;
+		next if $dxchan == $me;
+		
 		my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name
 		$dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit;
 	}
@@ -1534,6 +1531,8 @@ sub broadcast_all_ak1a
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	foreach $dxchan (@dxchan) {
 		next if grep $dxchan == $_, @except;
+		next if $dxchan == $me;
+
 		my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name
 		$dxchan->send($routeit);
 	}
@@ -1568,6 +1567,7 @@ sub broadcast_list
 	
 	foreach $dxchan (@_) {
 		my $filter = 1;
+		next if $dxchan == $me;
 		
 		if ($sort eq 'dx') {
 		    next unless $dxchan->{dx};