X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=59cdcf96c7272b5034007869e722e00df64ea830;hb=3e78861c5df183d45e4dc69bcde40d9672ec7e58;hp=cab45621fdb22d4f76511040475cbf00c3ba3ccb;hpb=96f91d83613b6351322d818f349137e457cb0168;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index cab45621..59cdcf96 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -349,6 +349,20 @@ sub normal
 				$to = $field[2];
 			}
 
+			# if this is a 'nodx' node then ignore it
+			if ($badnode->in($field[6]) || ($via && $badnode->in($via))) {
+				dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
+				return;
+			}
+
+			# if this is a 'bad spotter' user then ignore it
+			my $nossid = $from;
+			$nossid =~ s/-\d+$//;
+			if ($badspotter->in($nossid)) {
+				dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+				return;
+			}
+
 			# if we are converting announces to talk is it a dup?
 			if ($ann_to_talk) {
 				if (AnnTalk::is_talk_candidate($from, $field[3]) && AnnTalk::dup($from, $to, $field[3])) {
@@ -408,7 +422,9 @@ sub normal
 			}
 			
 			# if this is a 'bad spotter' user then ignore it
-			if ($badspotter->in($field[6])) {
+			my $nossid = $field[6];
+			$nossid =~ s/-\d+$//;
+			if ($badspotter->in($nossid)) {
 				dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
 				return;
 			}
@@ -549,6 +565,20 @@ sub normal
 				}
 			}
 
+			# if this is a 'nodx' node then ignore it
+			if ($badnode->in($field[5])) {
+				dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
+				return;
+			}
+
+			# if this is a 'bad spotter' user then ignore it
+			my $nossid = $field[1];
+			$nossid =~ s/-\d+$//;
+			if ($badspotter->in($nossid)) {
+				dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+				return;
+			}
+
 			if ($field[2] eq '*' || $field[2] eq $main::mycall) {
 
 
@@ -1207,6 +1237,9 @@ sub normal
 			
 			return;
 		}
+		if ($pcno == 90) {		# new style PC16,17,19,21
+			return;
+		}
 	}
 	 
 	# if get here then rebroadcast the thing with its Hop count decremented (if
@@ -1248,8 +1281,12 @@ sub process
 		next unless $dxchan->is_node();
 		next if $dxchan == $main::me;
 
-		# send the pc50
-		$dxchan->send($pc50s) if $pc50s;
+		# send the pc50 or PC90
+		if ($pc50s && $dxchan->is_spider) {
+#			$dxchan->send_route(\&pc90, 1, $main::me, 'T', @dxchan);
+		} else {
+			$dxchan->send($pc50s) if $pc50s;
+		}
 		
 		# send a ping out on this channel
 		if ($dxchan->{pingint} && $t >= $dxchan->{pingint} + $dxchan->{lastping}) {
@@ -1285,6 +1322,7 @@ sub process
 # some active measures
 #
 
+
 sub send_dx_spot
 {
 	my $self = shift;
@@ -1549,6 +1587,7 @@ sub send_local_config
 			dbg("sent a null value") if isdbg('chanerr');
 		}
 	}
+#	$self->send_route(\&pc90, 1, $main::me, 'T', DXChannel::get_all());
 }
 
 #
@@ -1915,6 +1954,12 @@ sub route_pc50
 	broadcast_route($self, \&pc50, 1, @_);
 }
 
+sub route_pc90
+{
+	my $self = shift;
+	broadcast_route($self, \&pc90, 1, @_);
+}
+
 sub in_filter_route
 {
 	my $self = shift;