X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXProt.pm;h=59cdcf96c7272b5034007869e722e00df64ea830;hb=1ef2fd58669de7cae92418c4591b9fce5f66bfb0;hp=5ab4186b2c64cb6e8082f5b57800a4c61dc30a82;hpb=49a14209678e26e31b2a9c89aec330c1a7a87b80;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 5ab4186b..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) {
 
 
@@ -668,11 +698,6 @@ sub normal
 			my $ncall = $field[2];
 			my $ucall = $field[1];
 
-			if (eph_dup($line)) {
-				dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
-				return;
-			}
-
 			eph_del_regex("^PC16\\^$ncall.*$ucall");
 			
 			if ($ncall eq $main::mycall) {
@@ -701,6 +726,12 @@ sub normal
 			return unless $self->in_filter_route($parent);
 			
 			$parent->del_user($uref);
+
+			if (eph_dup($line)) {
+				dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
+				return;
+			}
+
 			$self->route_pc17($parent, $uref);
 			return;
 		}
@@ -755,7 +786,7 @@ sub normal
 				my $dxchan = DXChannel->get($call);
 				if ($dxchan && $dxchan != $self) {
 					dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr');
-					return;
+					next;
 				}
 
 				# update it if required
@@ -825,11 +856,8 @@ sub normal
 		if ($pcno == 21) {		# delete a cluster from the list
 			my $call = uc $field[1];
 
-			if (eph_dup($line)) {
-				dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
-				return;
-			}
-
+			eph_del_regex("^PC1[79].*$call");
+			
 			# if I get a PC21 from the same callsign as self then treat it
 			# as a PC39: I have gone away
 			if ($call eq $self->call) {
@@ -837,8 +865,6 @@ sub normal
 				return;
 			}
 
-			eph_del_regex("^PC1[79].*$call");
-			
 			my @rout;
 			my $parent = Route::Node::get($self->{call});
 			unless ($parent) {
@@ -867,6 +893,11 @@ sub normal
 				return;
 			}
 
+#			if (eph_dup($line)) {
+#				dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
+#				return;
+#			}
+
 			$self->route_pc21(@rout) if @rout;
 			return;
 		}
@@ -1206,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
@@ -1247,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}) {
@@ -1284,6 +1322,7 @@ sub process
 # some active measures
 #
 
+
 sub send_dx_spot
 {
 	my $self = shift;
@@ -1548,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());
 }
 
 #
@@ -1914,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;