X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=748506be3bdb1411c55e84ec408eae3c225601b4;hb=0a81dd5596a3bd7746f00bad8f7c61b8d823a2ac;hp=51f40463ed3a582bd3260e0677109ee2cb2480e5;hpb=3d7b8f73c5a0a75fddfcc701a9c790ea3339a950;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 51f40463..748506be 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -879,17 +879,26 @@ sub handle_22
 	my $line = shift;
 	my $origin = shift;
 
-	if ($self->{do_pc92} && $self->{state} ne 'init92') {
-		dbg("PCPROT: disconnecting because login call not sent in any pc92") if isdbg('chanerr');
-		$self->send("**** You logged in with $self->{call} but that is NOT your \$mycall");
-		$self->disconnect;
-		return;
+	if ($self->{do_pc92}) {
+		if ($self->{state} ne 'init92') {
+			dbg("PCPROT: disconnecting because login call not sent in any pc92") if isdbg('chanerr');
+			$self->send("**** You logged in with $self->{call} but that is NOT your \$mycall");
+			$self->disconnect;
+			return;
+		}
+		my $ref = Route::Node::get($self->{call});
+		if ($ref) {
+			$main::me->route_pc92a($main::mycall, undef, $main::routeroot, $ref);
+		} else {
+			dbg("PCPROT: disconnecting because pc92 for $self->{call} received") if isdbg('chanerr');
+			$self->disconnect;
+			return;
+		}
+	} else {
+		$self->send_delayed_pc92;
 	}
-
-	$self->state('normal');
 	$self->{lastping} = 0;
-
-	$self->send_delayed_pc92
+	$self->state('normal');
 }
 				
 # WWV info
@@ -1379,11 +1388,11 @@ sub _add_thingy
 
 	if ($call) {
 		if ($is_node) {
+			dbg("ROUTE: added node $call to " . $parent->call) if isdbg('routelow');
 			@rout = $parent->add($call, $version, Route::here($here));
-			dbg("ROUTE: added node $call to " . $parent->call) if isdbg('route');
 		} else {
+			dbg("ROUTE: added user $call to " . $parent->call) if isdbg('routelow');
 			@rout = $parent->add_user($call, Route::here($here));
-			dbg("ROUTE: added user $call to " . $parent->call) if isdbg('route');
 		}
 	}
 	return @rout;
@@ -1398,12 +1407,12 @@ sub _del_thingy
 	if ($call) {
 		if ($is_node) {
 			my $nref = Route::Node::get($call);
+			dbg("ROUTE: deleting node $call from " . $parent->call) if isdbg('routelow');
 			@rout = $nref->del($parent) if $nref;
-			dbg("ROUTE: deleted node $call from " . $parent->call) if isdbg('route');
 		} else {
 			my $uref = Route::User::get($call);
+			dbg("ROUTE: deleting user $call from " . $parent->call) if isdbg('routelow');
 			@rout = $parent->del_user($uref) if $uref;
-			dbg("ROUTE: deleting user $call from " . $parent->call) if isdbg('route');
 		}
 	}
 	return @rout;
@@ -1454,6 +1463,8 @@ sub handle_92
 	my $line = shift;
 	my $origin = shift;
 
+	my (@radd, @rdel);
+	
 	$self->{do_pc92} ||= 1;
 
 	my $pcall = $_[1];
@@ -1527,8 +1538,6 @@ sub handle_92
 		push @nent, $_;
 	}
 
-	my (@radd, @rdel);
-	
 	if ($sort eq 'A') {
 		for (@nent) {
 			push @radd, _add_thingy($parent, $_);
@@ -1563,13 +1572,20 @@ sub handle_92
 
 		my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users);
 
+		# add users here
 		foreach my $r (@nent) {
 			my $call = $r->[0];
 			if ($call) {
 				push @radd,_add_thingy($parent, $r) if grep $call eq $_, (@$nnodes, @$nusers);
-				push @rdel,_del_thingy($parent, $r) if grep $call eq $_, (@$dnodes, @$dusers);
 			}
 		}
+		# del users here
+		foreach my $r (@$dnodes) {
+			push @rdel,_del_thingy($parent, [$r, 1]);
+		}
+		foreach my $r (@$dusers) {
+			push @rdel,_del_thingy($parent, [$r, 0]);
+		}
 	} else {
 		dbg("PCPROT: unknown action '$sort', ignored") if isdbg('chanerr');
 		return;