From: minima <minima>
Date: Sat, 3 Mar 2001 13:53:15 +0000 (+0000)
Subject: fix pc17 coming in with users on wrong nodes
X-Git-Tag: R_1_47~157
X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=25a3f1e8b4643da0befe759bcd2f4b99b01da909;p=spider.git

fix pc17 coming in with users on wrong nodes
---

diff --git a/Changes b/Changes
index bbb26d86..c41612bc 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 03Mar01=======================================================================
 1. allow incoming and outgoing IP connects direct to cluster.pl
+2. fixed (long standing)a hole in PC17 handling
 28Feb01=======================================================================
 1. allow sh/c gb7 (ie show the config of all gb7 nodes)(for example)
 2. get rid of spurious DXHash 'uninitialised' messages if no corresponding 
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 455311e3..6f4b089d 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -597,12 +597,16 @@ sub normal
 				dbg('chan', "PCPROT: $field[2] came in on wrong channel");
 				return;
 			}
-			if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) {
-				dbg('chan', "PCPROT: $field[2] connected locally");
+			if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) {
+				dbg('chan', "PCPROT: $field[1] connected locally");
 				return;
 			}
 			my $ref = DXCluster->get_exact($field[1]);
 			if ($ref) {
+				if ($ref->mynode != $node) {
+					dbg('chan', "PCPROT: $field[1] came in from wrong node $field[2]");
+					return;
+				}
 				$ref->del;
 			} else {
 				dbg('chan', "PCPROT: $field[1] not known" );