X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=e6f04a7f0a0113162d3f7c53f2079197a28e8131;hb=11d4503c67235600af279b57b785e5657faaf63c;hp=42479d86216ff9a43df0d773f77be59bbe417ebc;hpb=fee8c4eabda49d4c7440ce1075ea49dcd9c2e825;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 42479d86..e6f04a7f 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -45,7 +45,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim $allowzero $decode_dk0wcy $send_opernam @checklist $eph_pc15_restime $pc92_update_period $pc92_obs_timeout %pc92_find $pc92_find_timeout $pc92_short_update_period - $next_pc92_obs_timeout + $next_pc92_obs_timeout $pc92_slug_changes $last_pc92_slug ); $pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11 @@ -82,7 +82,6 @@ $pc92_obs_timeout = 60*60; # the time between obscount for incoming countdowns $next_pc92_obs_timeout = $main::systime + 60*60; # the time between obscount countdowns - @checklist = ( [ qw(i c c m bp bc c) ], # pc10 @@ -481,9 +480,17 @@ sub process dbg("ROUTE: pc92 broadcast candidate: $dxchan->{call}") if isdbg('obscount'); if ($dxchan == $main::me || !$dxchan->{do_pc9x}) { $dxchan->broadcast_pc92_update($dxchan->{call}); + $last_pc92_slug = 0 if $dxchan == $main::me; } } } + + if ($pc92_slug_changes && $main::systime >= $last_pc92_slug + $pc92_slug_changes) { + my ($add, $del) = gen_pc92_changes(); + $main::me->route_pc92d($main::mycall, undef, $main::routeroot, @$del) if @$del; + $main::me->route_pc92a($main::mycall, undef, $main::routeroot, @$add) if @$add; + clear_pc92_changes(); + } } if ($main::systime - 3600 > $last_hour) { @@ -866,6 +873,7 @@ sub gen_my_pc92_config my $node = shift; if ($node->{call} eq $main::mycall) { + clear_pc92_changes(); # remove any slugged data, we are generating it as now my @dxchan = grep { $_->call ne $main::mycall && !$_->{isolate} } DXChannel::get_all(); dbg("ROUTE: all dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow'); my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;