X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=fcff6240ae5291158dccf1dd14380d43b726ef5c;hb=dc0193176be801c10a342dd7a2b2263cf0059c88;hp=942f6faa61742fa5ace3edcb91630d176eab4b43;hpb=b29626c537438016f7221c667628d5e49b9f4fce;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 942f6faa..fcff6240 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -1603,7 +1603,7 @@ sub _add_thingy
 				$user = DXUser::get($call);
 				unless ($user) {
 					$user = DXUser->new($call);
-					dbg("PCProt::_add_thingy new user $call");
+					dbg("PCProt::_add_thingy new user $call") if isdbg('route');
 				}
 			}
 			if ($is_node) {
@@ -1622,7 +1622,7 @@ sub _add_thingy
 						} else {
 							$user->sort('A');
 						}
-						dbg("PCProt::_add_thingy node $call sort updated " . $user->sort);
+						dbg("PCProt::_add_thingy node $call sort updated " . $user->sort) if isdbg('route');
 					}
 				}
 			} else {
@@ -1807,11 +1807,11 @@ sub pc92_handle_first_slot
 	my ($call, $is_node, $is_extnode, $here, $version, $build) = @$slot;
 	if ($call && $is_node) {
 		if ($call eq $main::mycall) {
-			dbg("PCPROT: $call looped back onto \$main::mycall ($main::mycall), ignored") if isdbg('chan');
+			LogDbg('err', "PCPROT: $self->{call} : $call looped back onto \$main::mycall ($main::mycall), ignored");
 			return;
 		}
 		if ($call eq $main::myalias) {
-			dbg("PCPROT: $call looped back onto \$main::myalias ($main::myalias), ignored") if isdbg('chan');
+			LogDbg('err', "PCPROT: $self->{call} : $call looped back onto \$main::myalias ($main::myalias), ignored");
 			return;
 		}
 		# this is only accepted from my "self".
@@ -1872,12 +1872,12 @@ sub handle_92
 #	}
 
 	if ($pcall eq $main::mycall) {
-		dbg("PCPROT: looped back, ignored") if isdbg('chan');
+		LogDbg('err', "PCPROT: looped back, ignored");
 		return;
 	}
 
 	if ($pcall eq $main::myalias) {
-		dbg("PCPROT: looped back to \$myalias ($main::myalias), misconfiguration ignored") if isdbg('chan');
+		LogDbg('err', "PCPROT: looped back to \$myalias ($main::myalias), misconfiguration ignored");
 		return;
 	}
 
@@ -1941,10 +1941,10 @@ sub handle_92
 					if (@dxchan) {
 						$_->send($line) for @dxchan;
 					} else {
-						dbg("PCPROT: no return route, ignored") if isdbg('chanerr')
+						dbg("PCPROT: $self->{call} : type R no return route, ignored") if isdbg('chanerr') || isdbg('route');
 					}
 				} else {
-					dbg("PCPROT: no return route, ignored") if isdbg('chanerr')
+					dbg("PCPROT: $self->{call} : type R no return route, ignored") if isdbg('chanerr') || isdbg('route');
 				}
 			}
 			return;
@@ -2013,9 +2013,14 @@ sub handle_92
 			my $dxc;
 			next unless $_ && @$_;
 			if ($_->[0] eq $main::mycall) {
-				dbg("PCPROT: $_->[0] refers to me, ignored") if isdbg('chanerr');
+				LogDbg('err', "PCPROT: $self->{call} : type $sort $_->[0] refers to me, ignored");
 				next;
 			}
+			if ($_->[0] eq $main::myalias && $_->[1] || $_->[0] eq $main::mycall && $_->[1] == 0) {
+				LogDbg('err',"PCPROT: $self->{call} : type $sort $_->[0] changing type to " . $_->[1]?"Node":"User" . ", ignored");
+				next;
+			}
+			
 			push @nent, $_;
 		}
 
@@ -2044,7 +2049,7 @@ sub handle_92
 						push @users, $r->[0];
 					}
 				} else {
-					dbg("PCPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr');
+					dbg("PCPROT: $self->{call} :  pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr') || isdbg('route');
 				}
 			}