X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=18d7bdb5ae4bea70c4adfcea392b8e58a6f9aae4;hb=a58b356bd36167baa576ac7a762abe8f9f4a86f9;hp=835d4424f7a2dbcf80607651bbf0a0d72e6f5c21;hpb=c62d1dbdc3238711628d49608946eefedda2362e;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 835d4424..18d7bdb5 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -449,13 +449,6 @@ sub process } } - # send out a PC92 config record if required - if ($main::systime >= $dxchan->{next_pc92_update}) { - if ($dxchan->{call} eq $main::mycall || !$dxchan->{do_pc9x}) { - $dxchan->send_pc92_update($dxchan->{call}); - } - $dxchan->update_pc92_next($pc92_update_period); - } } Investigate::process(); @@ -474,6 +467,19 @@ sub process } $last10 = $t; + + # send out config broadcasts + foreach $dxchan (@dxchan) { + next unless $dxchan->is_node; + + # send out a PC92 config record if required for me and + # all my non pc9x dependent nodes. + if ($main::systime >= $dxchan->{next_pc92_update}) { + if ($dxchan->{call} eq $main::mycall || !$dxchan->{do_pc9x}) { + $dxchan->broadcast_pc92_update($dxchan->{call}); + } + } + } } if ($main::systime - 3600 > $last_hour) { @@ -834,16 +840,6 @@ sub gen_my_pc92_config } } -sub gen_pc92_update -{ - my $self = shift; - - # send 'my' configuration for all channels - my $l = gen_my_pc92_config($main::routeroot); - return $l; -} - - sub send_last_pc92_config { my $self = shift; @@ -866,15 +862,17 @@ sub send_pc92_config $self->send($node->last_PC92C); } -sub send_pc92_update +sub broadcast_pc92_update { my $self = shift; my $call = shift; - dbg('DXProt::send_pc92_update') if isdbg('trace'); + dbg('DXProt::broadcast_pc92_update') if isdbg('trace'); - my $l = gen_my_pc92_config(Route::Node::get($call)); + my $nref = Route::Node::get($call); + my $l = $nref->last_PC92C(gen_my_pc92_config($nref)); $main::me->broadcast_route_pc9x($main::mycall, undef, $l, 0); + $self->update_pc92_next($pc92_update_period); } sub time_out_pc92_routes