X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=9e1f7c6f880fbc54a16d4561b342ef0092101a48;hb=86316dcf45d7cbdcd8e3f512be655242ab1701ff;hp=72bce7c0ed45aef5394641a510e32bfbf337461e;hpb=b50b7a1c99679f3624852f29068a6cde268e9560;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 72bce7c0..9e1f7c6f 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -527,11 +527,6 @@ sub normal
 		
 		if ($pcno == 16) {		# add a user
 
-			if (eph_dup($line)) {
-				dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
-				return;
-			}
-
 			# general checks
 			my $dxchan;
 			my $ncall = $field[1];
@@ -589,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';     
@@ -601,10 +600,6 @@ sub normal
 			my $dxchan;
 			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");
 			
@@ -627,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;
 		}
@@ -647,11 +648,6 @@ sub normal
 			my $i;
 			my $newline = "PC19^";
 
-			if (eph_dup($line)) {
-				dbg("PCPROT: dup PC19 detected") if isdbg('chanerr');
-				return;
-			}
-
 			# new routing list
 			my @rout;
 			my $parent = Route::Node::get($self->{call});
@@ -669,7 +665,7 @@ sub normal
 				my $ver = $field[$i+3];
 				next unless defined $here && defined $conf && is_callsign($call);
 
-				eph_del_regex("^PC21\^$call");
+				eph_del_regex("^PC(?:21\^$call|17\^[^\^]+\^$call)");
 				
 				# check for sane parameters
 				$ver = 5000 if $ver eq '0000';
@@ -728,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;
 		}
@@ -740,14 +741,9 @@ sub normal
 		}
 		
 		if ($pcno == 21) {		# delete a cluster from the list
-			if (eph_dup($line)) {
-				dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
-				return;
-			}
-
 			my $call = uc $field[1];
 
-			eph_del_regex("^PC19.*$call");
+			eph_del_regex("^PC1[79].*$call");
 			
 			my @rout;
 			my $parent = Route::Node::get($self->{call});
@@ -774,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;
 		}
@@ -904,6 +906,7 @@ sub normal
 		if ($pcno == 39) {		# incoming disconnect
 			if ($field[1] eq $self->{call}) {
 				$self->disconnect(1);
+				eph_dup_regex("^PC(?:1[679]|21).*$field[1]");
 			} else {
 				dbg("PCPROT: came in on wrong channel") if isdbg('chanerr');
 			}
@@ -984,6 +987,7 @@ sub normal
 			my $to = $field[1];
 			my $from = $field[2];
 			my $flag = $field[3];
+
 			
 			# is it for us?
 			if ($to eq $main::mycall) {
@@ -1019,6 +1023,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);
 			}