X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=20eb37e417db85cb7d9ec2e9158b796df14f32e2;hb=dbf603084915189ec6e853e674d55688b93ff0d9;hp=5eb35f6b768dcee4aa5f378e9de29888a04b69e2;hpb=4a9c1e3fabd9931b914307ee4f79e7259b8cdfd6;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 5eb35f6b..20eb37e4 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -473,8 +473,10 @@ sub handle_16
 		$user->lastin($main::systime) unless DXChannel::get($call);
 		$user->put;
 	}
-	$self->route_pc16($origin, $line, $parent, @rout) if @rout;
-	
+	if (@rout) {
+		$self->route_pc16($origin, $line, $parent, @rout);
+		$self->route_pc92a($main::mycall, undef, $parent, @rout);
+	}
 }
 		
 # remove a user
@@ -541,6 +543,7 @@ sub handle_17
 
 	$uref = Route->new($ucall) unless $uref; # throw away
 	$self->route_pc17($origin, $line, $parent, $uref);
+	$self->route_pc92d($main::mycall, undef, $parent, $uref);
 }
 		
 # link request
@@ -1262,14 +1265,16 @@ sub _encode_pc92_call
 	my $call = $ref->call; 
 	my $extra = '';
 	$flag |= $ref->here ? 1 : 0;
-	if ($ext && ($ref->isa('Route::Node') || $ref->isa('DXProt'))) {
+	if ($ref->isa('Route::Node') || $ref->isa('DXProt')) {
 		$flag |= 4;
-#		if ($ref->version || $ref->build) {
-		if ($ref->version) {
-			my $version = $ref->version || 1.0;
-			$version =  $version * 100 + 5300 if $version < 50;
-			$extra .= ":" . $version;
-#			$extra .= (":" . ($ref->build ? $ref->build : '')) if $ref->build;
+		my $dxchan = DXChannel::get($call);
+		$flag |= 2 if $call ne $main::mycall && $dxchan && !$dxchan->{do_pc92};
+		if ($ext) {
+			if ($ref->version) {
+				my $version = $ref->version || 1.0;
+				$version =  $version * 100 + 5300 if $version < 50;
+				$extra .= ":" . $version;
+			}
 		}
 	}
 	return "$flag$call$extra";
@@ -1348,23 +1353,56 @@ sub handle_92
 	$parent->lastid->{92} = $t;
 	$parent->build($build) if $build;
 
+	my (@radd, @rdel);
+	
 	if ($sort eq 'A') {
 		if ($_[4]) {
-			_add_thingy($parent, $_[4]);
+			if (@radd = _add_thingy($parent, $_[4])) {
+			}
 		}
 	} elsif ($sort eq 'D') {
 		if ($_[4]) {
-			_del_thingy($parent, $_[4]);
+			if (@rdel = _del_thingy($parent, $_[4])) {
+			}
 		}
 	} elsif ($sort eq 'C') {
 		my $i;
-		$parent->del_nodes;
-		$parent->_del_users;
+		my (@nodes, @users);
+		for ($i = 4; $_[$i]; $i++) {
+			my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_[$i]);
+			if ($call) {
+				if ($is_node) {
+					push @nodes, $call;
+				} else {
+					push @users, $call;
+				}
+			} else {
+				dbg("DXPROT: pc92 call entry '$_[$i]' not decoded, ignored") if isdbg('chanerr'); 
+			}
+		}
+
+		my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users);
+
 		for ($i = 4; $_[$i]; $i++) {
-			_add_thingy($parent, $_[$i]);
+			my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_[$i]);
+			if ($call) {
+				push @radd,_add_thingy($parent, $_[$i]) if grep $call eq $_, (@$nnodes, @$nusers);
+				push @rdel,_del_thingy($parent, $_[$i]) if grep $call eq $_, (@$dnodes, @$dusers);
+			}
 		}
 	} else {
 		dbg("PCPROT: unknown action '$sort', ignored") if isdbg('chanerr');
+		return;
+	}
+
+	$self->broadcast_route_pc9x($origin, undef, $line, 0);
+	foreach my $r (@rdel) {
+		$self->route_pc21($pcall, undef, $r) if $r->isa('Route::Node');
+		$self->route_pc17($pcall, undef, $parent, $r) if $r->isa('Route::User');
+	}
+	foreach my $r (@radd) {
+		$self->route_pc19($pcall, undef, $r) if $r->isa('Route::Node');
+		$self->route_pc16($pcall, undef, $parent, $r) if $r->isa('Route::User');
 	}
 }