X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=73f139193a4279febaba885c4ba5d7965fe90d00;hb=5094a0b55d903d344277adf9d26b5af8e37247d8;hp=b04536e4bc2e374f8b4be35f788bef16d9848181;hpb=2ef7a1dea1a74d743a7d806a58f97f55f90effcd;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index b04536e4..73f13919 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -863,9 +863,11 @@ sub handle_18
 	$self->state('init');
 
 	my $parent = Route::Node::get($self->{call});
-	
+
+	my ($software, $version, $build) = (undef, 0, 0);
+	 
 	# record the type and version offered
-	if (my ($software, $version) = $pc->[1] =~ /(DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+)?)/i) {
+	if (($software, $version) = $pc->[1] =~ /(DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+)?)/i) {
 		$version += 0;
 		$version += 53 if $version < 6;
 		$self->{version} = $version;
@@ -885,7 +887,7 @@ sub handle_18
 			$self->sort('S');
 		}
 #		$self->{handle_xml}++ if DXXml::available() && $pc->[1] =~ /\bxml/;
-	} elsif (my ($software, $version, $build) = $pc->[1] =~ /(AR-Cluster)\s+Version:\s+(\d+\.\d+).?(\d+\.\d+)?/) {
+	} elsif (($software, $version, $build) = $pc->[1] =~ /(AR-Cluster)\s+Version:\s+(\d+\.\d+).?(\d+\.\d+)?/) {
 		dbg("$self->{call} = $software version $version build $build");
 		$self->{version} = $version;
 		$self->user->version($version);
@@ -943,7 +945,7 @@ sub check_add_user
 			$user->node($homenode);
 			$user->priv(0);
 		}
-		$user->lastin($main::systime); # this make it last longer than just this invocation
+		$user->lastin($main::systime); # this makes it last longer than just this invocation
 		$user->put;				# just to make sure it gets written away!!!
 		dbg("DXProt: PC92 new user record for $call created");
 	}
@@ -1030,6 +1032,12 @@ sub handle_19
 			next;
 		}
 
+		if ($call eq $main::myalias) {
+			LogDbg('err', "ROUTE: $call eq \$myalias from $self->{call}, ignored!!!");
+			dbgprintring(3) if isdbg('nologchan');
+			next;
+		}
+		
 		my $user = check_add_user($call, 'A');
 
 #		if (eph_dup($genline)) {
@@ -1805,7 +1813,12 @@ sub _add_thingy
 				$user->del if $user;
 			    $call = $normcall; # this is safe because a route add will ignore duplicates
 			}
-			
+
+			if ($call eq $main::myalias && $is_node) {
+				LogDbg('err', "ROUTE: $call eq \$myalias from $ncall - downgraded to user!!!");
+				dbgprintring(3) if isdbg('nologchan');
+				$is_node = 0;
+			}
 			if ($is_node) {
 				dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
 				$user = check_add_user($call, 'A');
@@ -2247,7 +2260,9 @@ sub handle_92
 				dbg("PCPROT: $self->{call} : type $sort $_->[0] refers to me, ignored") if isdbg('route');
 				next;
 			}
-			if ($_->[0] eq $main::myalias && $_->[1] || $_->[0] eq $main::mycall && $_->[1] == 0) {
+
+			my $isnode = ($_->[1] | $_->[2]);
+			if (($_->[0] eq $main::myalias && $isnode) || ($_->[0] eq $main::mycall && !$isnode)) {
 				LogDbg('err',"PCPROT: $self->{call} : type $sort $_->[0] trying to change type to " . $_->[1]?"Node":"User" . ", ignored");
 				next;
 			}