From: minima <minima>
Date: Fri, 5 Jan 2007 20:05:43 +0000 (+0000)
Subject: fix pc92 update call
X-Git-Tag: 1.54~67
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=4fd5f55c3716bfef803aec68a4a632e220e54862;p=spider.git

fix pc92 update call
---

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 81cdeaee..aaa07048 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -772,33 +772,35 @@ sub send_local_config
 	}
 }
 
-sub send_pc92_config
+sub gen_pc92_update
 {
 	my $self = shift;
+	my $with_pc92_nodes = shift;
 	my $node;
-
-	dbg('DXProt::send_pc92_config') if isdbg('trace');
+	my @lines;
+	
+	dbg('DXProt::send_pc92_update') if isdbg('trace');
 
 	# send 'my' configuration for all users and pc92 capable nodes
 	my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all();
 	my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
 #	push @localnodes, map { my $r = Route::Node::get($_->{call}); $r ? $r : () } DXChannel::get_all_users();
-	$self->send_route_pc92($main::mycall, \&pc92c, (scalar @localnodes)+1, $main::routeroot, @localnodes);
+	push @lines, pc92c($main::routeroot, @localnodes);
 
-	# send out the configuration of all the 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_pc92} } DXChannel::get_all_nodes();
-	@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
-	foreach $node (@localnodes) {
-		if ($node && $node->lastid->{92}) {
-			my @rout = map {my $r = Route::get($_); $r ? ($r) : ()} $node->nodes, $node->users;
-			my $line = gen_pc92_with_time($node->call, 'C', $node->lastid->{92}, @rout);
-			$self->send($line);
-		} else {
-			dbg("sent a null value") if isdbg('chanerr');
+
+	if ($with_pc92_nodes) {
+		# send out the configuration of all the 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_pc92} } DXChannel::get_all_nodes();
+		@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
+		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 '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_pc92} } DXChannel::get_all_nodes();
@@ -806,42 +808,34 @@ sub send_pc92_config
 	foreach $node (@localnodes) {
 		if ($node) {
 			my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
-			$self->send_route_pc92($main::mycall, \&pc92c, 1, $node, @rout) if @rout;
-		} else {
-			dbg("sent a null value") if isdbg('chanerr');
-		}
+			push @lines, pc92c($node, @rout);
+		} 
 	}
-} 
+	return @lines;
+}
 
-sub send_pc92_update
+
+sub send_pc92_config
 {
 	my $self = shift;
-	my $node;
-	my @lines;
-	
-	dbg('DXProt::send_pc92_update') if isdbg('trace');
-
-	# send 'my' configuration for all users and pc92 capable nodes
-	my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all();
-	my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
-#	push @localnodes, map { my $r = Route::Node::get($_->{call}); $r ? $r : () } DXChannel::get_all_users();
-	push @lines, pc92c($main::routeroot, @localnodes);
 
+	dbg('DXProt::send_pc92_config') if isdbg('trace');
 
-	# send the configuration of all the '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_pc92} } DXChannel::get_all_nodes();
-	@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
-	foreach $node (@localnodes) {
-		if ($node) {
-			my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
-			push @lines, pc92c($node, @rout);
-		} 
+	my @out = $self->gen_pc92_update(1);
+	
+	# send the complete config out on this interface
+	for (@out) {
+		$self->send($_);
 	}
+} 
 
+sub send_pc92_update
+{
+	my @out = $main::me->gen_pc92_update(0);
+	
 	# broadcast the lines to all PC92 nodes
-	for (@lines) {
-		$main::me->broadcast_route_pc92('', undef, $_, 0);
+	for (@out) {
+		$main::me->broadcast_route_pc9x('', undef, $_, 0);
 	}
 }