X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=345b61cb42f6965a121572662a4c9239b1983f0f;hb=99e970eab7e843c6810039bc85f462b270534a62;hp=2c9cda2db2cd26933eede80f5115f91f294b2797;hpb=b58ca3b5845f03a444f401ba5fdc1d054f853492;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 2c9cda2d..345b61cb 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -451,7 +451,9 @@ sub process
 
 		# send out a PC92 config record if required
 		if ($main::systime >= $dxchan->{next_pc92_update}) {
-			$dxchan->send_pc92_config;
+			if ($dxchan->{call} eq $main::mycall || !$dxchan->{do_pc9x}) {
+				$dxchan->send_pc92_update($dxchan->{call});
+			}
 			$dxchan->update_pc92_next($pc92_update_period);
 		}
 	}
@@ -769,9 +771,11 @@ sub send_local_config
 	my @remotenodes;
 
 	if ($self->{isolate}) {
+		dbg("send_local_config: isolated");
 		@localnodes = ( $main::routeroot );
 		$self->send_route($main::mycall, \&pc19, 1, $main::routeroot);
 	} elsif ($self->{do_pc9x}) {
+		dbg("send_local_config: doing pc9x");
 		my $node = Route::Node::get($self->{call});
 		$self->send_last_pc92_config($main::routeroot);
 		$self->send(pc92a($main::routeroot, $node)) unless $main::routeroot->last_PC92C =~ /$self->{call}/;
@@ -780,6 +784,8 @@ sub send_local_config
 		# and are not themselves isolated, this to make sure that isolated nodes
 		# don't appear outside of this node
 
+		dbg("send_local_config: traditional");
+
 		# send locally connected nodes
 		my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
 		@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
@@ -831,46 +837,10 @@ sub gen_my_pc92_config
 sub gen_pc92_update
 {
 	my $self = shift;
-	my $with_pc92_nodes = shift;
-	my $node;
-	my @lines;
-	my @dxchan;
-	my @localnodes;
-
-	dbg('ROUTE: DXProt::gen_pc92_update start') if isdbg('routelow');
 
 	# send 'my' configuration for all channels
-	push @lines, gen_my_pc92_config($main::routeroot);
-
-#	if ($with_pc92_nodes) {
-		# send out the configuration of all the directly connected PC92 nodes with current configuration
-		# but with the dates that the last config came in with.
-#		@dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{do_pc9x} } DXChannel::get_all_nodes();
-#		dbg("ROUTE: pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
-#		@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
-#		dbg("ROUTE: pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
-#		foreach $node (@localnodes) {
-#			if ($node && $node->lastid->{92}) {
-#				my @rout = map {my $r = Route::get($_); $r ? ($r) : ()} $node->nodes, $node->users;
-#				push @lines, gen_pc92_with_time($node->call, 'C', $node->lastid->{92}, @rout);
-#			}
-#		}
-#	}
-
-	# send the configuration of all the directly connected 'external' nodes that don't handle PC92
-	# out with the 'external' marker on the first node.
-#	@dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && !$_->{do_pc9x} } DXChannel::get_all_nodes();
-#	dbg("ROUTE: non pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
-#	@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
-#	dbg("ROUTE: non pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
-#	foreach $node (@localnodes) {
-#		if ($node) {
-#			push @lines, gen_my_pc92_config($node);
-#		}
-#	}
-
-	dbg('ROUTE: DXProt::gen_pc92_update end with ' . scalar @lines . ' lines') if isdbg('routelow');
-	return @lines;
+	my $l = gen_my_pc92_config($main::routeroot);
+	return $l;
 }
 
 
@@ -898,12 +868,13 @@ sub send_pc92_config
 
 sub send_pc92_update
 {
-	my @out = $main::me->gen_pc92_update(0);
+	my $self = shift;
+	my $call = shift;
 
-	# broadcast the lines to all PC92 nodes
-	for (@out) {
-		$main::me->broadcast_route_pc9x($main::mycall, undef, $_, 0);
-	}
+	dbg('DXProt::send_pc92_update') if isdbg('trace');
+
+	my $l = gen_my_pc92_config(Route::Node::get($call));
+	$main::me->broadcast_route_pc9x($main::mycall, undef, $l, 0);
 }
 
 sub time_out_pc92_routes