From: minima Date: Wed, 3 Jan 2007 11:17:02 +0000 (+0000) Subject: split pc92 from non pc92 nodes in init X-Git-Tag: 1.54~78 X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?p=spider.git;a=commitdiff_plain;h=a313d9c8eb2ea8bbdbe9b5d6e49583d0d422a621 split pc92 from non pc92 nodes in init --- diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 24cffb8d..ba4f21d9 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -770,8 +770,8 @@ sub send_pc92_config dbg('DXProt::send_pc92_config') if isdbg('trace'); - # send 'my' configuration - my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all(); + # send 'my' configuration for all users and pc92 capable nodes + my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $self->{do_pc92} } DXChannel::get_all(); my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan; $self->send_route_pc92($main::mycall, \&pc92c, scalar @localnodes, @localnodes); diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 858ea00e..5715902c 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -1264,7 +1264,8 @@ sub _encode_pc92_call $flag |= $ref->here ? 1 : 0; if ($ref->isa('Route::Node') || $ref->isa('DXProt')) { $flag |= 4; - $flag |= 2 if $call ne $main::mycall && DXChannel::get($call); + 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;