X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=b4be90c0f4a88fba2cb60363029c2fb9530a3c71;hb=fbfd8dc2d58c550bf3922efb54ec4ee817df07d5;hp=2e43068a6951c7f42517c98a5170b57bd76fba68;hpb=bda1cef129c5b201f7640433ce1844af45a68fcb;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 2e43068a..b4be90c0 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -556,6 +556,8 @@ sub normal
 				my ($call, $conf, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
 				next unless $call && $conf && defined $here && is_callsign($call);
 				next if $call eq $main::mycall;
+
+				eph_del_regex("^PC17\^$call\^$ncall");
 				
 				$conf = $conf eq '*';
 
@@ -582,6 +584,10 @@ sub normal
 				$user->put;
 			}
 
+			if (eph_dup($line)) {
+				dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
+				return;
+			}
 			
 			# queue up any messages (look for privates only)
 			DXMsg::queue_msg(1) if $self->state eq 'normal';     
@@ -594,6 +600,9 @@ sub normal
 			my $dxchan;
 			my $ncall = $field[2];
 			my $ucall = $field[1];
+
+			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');
 				return;
@@ -613,6 +622,12 @@ sub normal
 			return unless $self->in_filter_route($parent);
 
 			my @rout = $parent->del_user($ucall);
+
+			if (eph_dup($line)) {
+				dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
+				return;
+			}
+
 			$self->route_pc17($parent, @rout) if @rout;
 			return;
 		}
@@ -649,6 +664,9 @@ sub normal
 				my $conf = $field[$i+2];
 				my $ver = $field[$i+3];
 				next unless defined $here && defined $conf && is_callsign($call);
+
+				eph_del_regex("^PC(?:21\^$call|17\^[^\^]+\^$call)");
+				
 				# check for sane parameters
 				$ver = 5000 if $ver eq '0000';
 				next if $ver < 5000; # only works with version 5 software
@@ -706,6 +724,11 @@ sub normal
 				$user->put;
 			}
 
+			if (eph_dup($line)) {
+				dbg("PCPROT: dup PC19 detected") if isdbg('chanerr');
+				return;
+			}
+
 			$self->route_pc19(@rout) if @rout;
 			return;
 		}
@@ -719,6 +742,9 @@ sub normal
 		
 		if ($pcno == 21) {		# delete a cluster from the list
 			my $call = uc $field[1];
+
+			eph_del_regex("^PC1[79].*$call");
+			
 			my @rout;
 			my $parent = Route::Node::get($self->{call});
 			unless ($parent) {
@@ -744,6 +770,12 @@ sub normal
 				dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr');
 				return;
 			}
+
+			if (eph_dup($line)) {
+				dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
+				return;
+			}
+
 			$self->route_pc21(@rout) if @rout;
 			return;
 		}
@@ -874,6 +906,7 @@ 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');
 			}
@@ -887,6 +920,11 @@ sub normal
 #			my $ref = Route::get($call) || Route->new($call);
 #			return unless $self->in_filter_route($ref);
 
+			if ($field[3] eq $field[2]) {
+				dbg('PCPROT: invalid value') if isdbg('chanerr');
+				return;
+			}
+
 			# add this station to the user database, if required
 			my $user = DXUser->get_current($call);
 			$user = DXUser->new($call) if !$user;
@@ -954,6 +992,7 @@ sub normal
 			my $to = $field[1];
 			my $from = $field[2];
 			my $flag = $field[3];
+
 			
 			# is it for us?
 			if ($to eq $main::mycall) {
@@ -989,6 +1028,10 @@ sub normal
 					}
 				}
 			} else {
+				if (eph_dup($line)) {
+					dbg("PCPROT: dup PC51 detected") if isdbg('chanerr');
+					return;
+				}
 				# route down an appropriate thingy
 				$self->route($to, $line);
 			}
@@ -1675,7 +1718,7 @@ sub disconnect
 	my $node = Route::Node::get($call);
 	my @rout;
 	if ($node) {
-		@rout = $node->del_nodes;    # at the next level
+#		@rout = $node->del_nodes;    # at the next level
 		@rout = $node->del($main::routeroot);
 	}
 	
@@ -1844,6 +1887,17 @@ sub eph_dup
 	return undef;
 }
 
+sub eph_del_regex
+{
+	my $regex = shift;
+	my ($key, $val);
+	while (($key, $val) = each %eph) {
+		if ($key =~ m{$regex}) {
+			delete $eph{$key};
+		}
+	}
+}
+
 sub eph_clean
 {
 	my ($key, $val);