X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=1da81e95b2c98a6b9ca2bdac3a41a13186d7823f;hb=dbf603084915189ec6e853e674d55688b93ff0d9;hp=58b5982df7848e278e598d69db784acc4b104324;hpb=c6428493a82dbc2c59d92ba12d288975e2b936ba;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 58b5982d..1da81e95 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -769,11 +769,25 @@ sub send_pc92_config my $node; dbg('DXProt::send_pc92_config') if isdbg('trace'); - - my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all(); - my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan if @dxchan; + + # send 'my' configuration for all users and pc92 capable nodes + my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{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); -} + + # 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; + $self->send_route_pc92($main::mycall, \&pc92c, 1, $node, @rout) if @rout; + } else { + dbg("sent a null value") if isdbg('chanerr'); + } + } +} # # route a message down an appropriate interface for a callsign