X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=c099a92c4163050ebe63ad157296a9f2dccfa2b5;hb=e9ed4c81c3a4286ec5b32344a844a49ae18af8ba;hp=99fc85ce7e3c42723bec9a8c5da038f2d540beb9;hpb=736bf55438e247cf763d65fb467fa62af7f2a704;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 99fc85ce..c099a92c 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -46,7 +46,7 @@ $last_hour = time;				# last time I did an hourly periodic update
 %pings = ();                    # outstanding ping requests outbound
 %rcmds = ();                    # outstanding rcmd requests outbound
 %nodehops = ();                 # node specific hop control
-$censorpc = 0;					# Do a BadWords::check on text fields and reject things
+$censorpc = 1;					# Do a BadWords::check on text fields and reject things
 								# loads of 'bad things'
 $baddx = new DXHash "baddx";
 $badspotter = new DXHash "badspotter";
@@ -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);
@@ -357,6 +354,11 @@ 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;
@@ -596,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" );
@@ -1138,42 +1144,6 @@ sub process
 #
 # finish up a pc context
 #
-sub finish
-{
-	my $self = shift;
-	my $call = $self->call;
-	my $conn = shift;
-	my $ref = DXCluster->get_exact($call);
-	
-	# unbusy and stop and outgoing mail
-	my $mref = DXMsg::get_busy($call);
-	$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 $node;
-	
-	foreach $node (@gonenodes) {
-		next if $node->call eq $call;
-		broadcast_ak1a(pc21($node->call, 'Gone') , $self) unless $self->{isolate}; 
-		$node->del();
-	}
-
-	# remove outstanding pings
-	delete $pings{$call};
-	
-	# now broadcast to all other ak1a nodes that I have gone
-	broadcast_ak1a(pc21($call, 'Gone.'), $self) unless $self->{isolate};
-
-	# I was the last node visited
-    $self->user->node($main::mycall);
-
-	# send info to all logged in thingies
-	$self->tell_login('logoutn');
-
-	Log('DXProt', $call . " Disconnected");
-	$ref->del() if $ref;
-}
 
 #
 # some active measures
@@ -1508,6 +1478,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;
 	}
@@ -1525,6 +1497,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);
 	}
@@ -1559,6 +1533,7 @@ sub broadcast_list
 	
 	foreach $dxchan (@_) {
 		my $filter = 1;
+		next if $dxchan == $me;
 		
 		if ($sort eq 'dx') {
 		    next unless $dxchan->{dx};
@@ -1675,11 +1650,40 @@ sub disconnect
 {
 	my $self = shift;
 	my $nopc39 = shift;
+	my $call = $self->call;
 
-	if ($self->{conn} && !$nopc39) {
+	unless ($nopc39) {
 		$self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
 	}
 
+	# unbusy and stop and outgoing mail
+	my $mref = DXMsg::get_busy($call);
+	$mref->stop_msg($call) if $mref;
+	
+	# broadcast to all other nodes that all the nodes connected to via me are gone
+	foreach my $node (grep { $_->dxchan == $self } DXNode::get_all) {
+		next if $node->call eq $call;
+		next if $node->call eq $main::mycall;
+		broadcast_ak1a(pc21($node->call, 'Gone.'), $self) unless $self->{isolate};
+		$node->del;
+	}
+
+	# remove outstanding pings
+	delete $pings{$call};
+	
+	# now broadcast to all other ak1a nodes that I have gone
+	broadcast_ak1a(pc21($call, 'Gone.'), $self) unless $self->{isolate};
+
+	# I was the last node visited
+    $self->user->node($main::mycall);
+
+	# send info to all logged in thingies
+	$self->tell_login('logoutn');
+
+	Log('DXProt', $call . " Disconnected");
+	my $ref = DXCluster->get_exact($call);
+	$ref->del() if $ref;
+
 	$self->SUPER::disconnect;
 }