X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=ba79e43e0419ffab6a528e62123ba5ae41886929;hb=89643eba546b3cda9ba83a527919fad79651b858;hp=9791850521d5fbb00ac2ba190223fe9436ce91d5;hpb=cb340a0cf45f789d95201e4d4b9aec4ed581622d;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 97918505..ba79e43e 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -63,7 +63,7 @@ $last10 = $last_pc50 = time;
 $ann_to_talk = 1;
 $rspfcheck = 1;
 $eph_restime = 180;
-$eph_info_restime = 15*60;
+$eph_info_restime = 60*60;
 $eph_pc34_restime = 30;
 
 @checklist = 
@@ -349,6 +349,18 @@ 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
+			if ($badspotter->in($from)) {
+				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])) {
@@ -442,6 +454,7 @@ sub normal
 				}
 			}
 
+
 			my @spot = Spot::prepare($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
 			# global spot filtering on INPUT
 			if ($self->{inspotsfilter}) {
@@ -451,7 +464,10 @@ sub normal
 					return;
 				}
 			}
-			
+
+			# this goes after the input filtering, but before the add
+			# so that if it is input filtered, it isn't added to the dup
+			# list. This allows it to come in from a "legitimate" source
 			if (Spot::dup($field[1], $field[2], $d, $field[5])) {
 				dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
 				return;
@@ -545,6 +561,18 @@ 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
+			if ($badspotter->in($field[1])) {
+				dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+				return;
+			}
+
 			if ($field[2] eq '*' || $field[2] eq $main::mycall) {
 
 
@@ -617,7 +645,7 @@ sub normal
 				next unless $call && $conf && defined $here && is_callsign($call);
 				next if $call eq $main::mycall;
 
-				eph_del_regex("^PC17\^$call\^$ncall");
+				eph_del_regex("^PC17\\^$call\\^$ncall");
 				
 				$conf = $conf eq '*';
 
@@ -664,12 +692,7 @@ 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");
+			eph_del_regex("^PC16\\^$ncall.*$ucall");
 			
 			if ($ncall eq $main::mycall) {
 				dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr');
@@ -697,6 +720,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;
 		}
@@ -739,7 +768,7 @@ sub normal
 				my $ver = $field[$i+3];
 				next unless defined $here && defined $conf && is_callsign($call);
 
-				eph_del_regex("^PC(?:21\^$call|17\^[^\^]+\^$call)");
+				eph_del_regex("^PC(?:21\\^$call|17\\^[^\\^]+\\^$call)");
 				
 				# check for sane parameters
 #				$ver = 5000 if $ver eq '0000';
@@ -751,7 +780,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
@@ -821,21 +850,15 @@ 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) {
 				$self->disconnect(1);
-				eph_del_regex("^PC(?:1[679]|21).*$field[1]");
 				return;
 			}
 
-			eph_del_regex("^PC1[79].*$call");
-			
 			my @rout;
 			my $parent = Route::Node::get($self->{call});
 			unless ($parent) {
@@ -864,6 +887,11 @@ sub normal
 				return;
 			}
 
+#			if (eph_dup($line)) {
+#				dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
+#				return;
+#			}
+
 			$self->route_pc21(@rout) if @rout;
 			return;
 		}
@@ -989,7 +1017,7 @@ sub normal
 		}
 		
 		if ($pcno == 35) {		# remote command replies
-			eph_del_regex("^PC35\^$field[2]\^$field[1]\^");
+			eph_del_regex("^PC35\\^$field[2]\\^$field[1]\\^");
 			$self->process_rcmd_reply($field[1], $field[2], $field[1], $field[3]);
 			return;
 		}
@@ -1003,7 +1031,6 @@ sub normal
 		if ($pcno == 39) {		# incoming disconnect
 			if ($field[1] eq $self->{call}) {
 				$self->disconnect(1);
-				eph_del_regex("^PC(?:1[679]|21).*$field[1]");
 			} else {
 				dbg("PCPROT: came in on wrong channel") if isdbg('chanerr');
 			}
@@ -1762,6 +1789,10 @@ sub disconnect
 		$self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
 	}
 
+	# get rid of any PC16 and 19s
+	eph_del_regex("^PC16\\^$call");
+	eph_del_regex("^PC19\\^.*$call");
+
 	# do routing stuff
 	my $node = Route::Node::get($call);
 	my @rout;
@@ -1966,5 +1997,10 @@ sub eph_list
 	}
 	return @out;
 }
+
+sub run_cmd
+{
+	goto &DXCommandmode::run_cmd;
+}
 1;
 __END__