%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
$allowzero $decode_dk0wcy $send_opernam @checklist
$eph_pc15_restime $pc92_update_period $pc92_obs_timeout
- %pc92_find $pc92_find_timeout
+ %pc92_find $pc92_find_timeout $pc92_short_update_period
);
$pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11
$investigation_int = 12*60*60; # time between checks to see if we can see this node
$pc19_version = 5466; # the visible version no for outgoing PC19s generated from pc59
$pc92_update_period = 60*60; # the period between PC92 C updates
+$pc92_short_update_period = 15*60; # shorten the update period after a connection
%pc92_find = (); # outstanding pc92 find operations
$pc92_find_timeout = 30; # maximum time to wait for a reply
$pc92_obs_timeout = $pc92_update_period; # the time between obscount countdowns
sub update_pc92_next
{
my $self = shift;
- $self->{next_pc92_update} = $main::systime + $pc92_update_period - int rand($pc92_update_period / 4);
+ my $period = shift || $pc92_update_period;
+ $self->{next_pc92_update} = $main::systime + $period - int rand($period / 4);
}
sub init
$main::me->{version} = $main::version;
$main::me->{build} = "$main::subversion.$main::build";
$main::me->{do_pc9x} = 1;
- $main::me->update_pc92_next;
+ $main::me->update_pc92_next($pc92_update_period);
}
#
my $script = new Script(lc $call) || new Script('node_default');
$script->run($self) if $script;
- # set next_pc92_update time
- $self->update_pc92_next;
+ # set next_pc92_update time for this node sooner
+ $self->update_pc92_next($pc92_short_update_period);
}
#
# send out a PC92 config record if required
if ($main::systime >= $dxchan->{next_pc92_update}) {
- $dxchan->send_pc92_config;
- $dxchan->update_pc92_next;
+ if ($dxchan->{call} eq $main::mycall || !$dxchan->{do_pc9x}) {
+ $dxchan->send_pc92_update($dxchan->{call});
+ }
+ $dxchan->update_pc92_next($pc92_update_period);
}
}
my @remotenodes;
if ($self->{isolate}) {
+ dbg("send_local_config: isolated");
@localnodes = ( $main::routeroot );
$self->send_route($main::mycall, \&pc19, 1, $main::routeroot);
} elsif ($self->{do_pc9x}) {
+ dbg("send_local_config: doing pc9x");
my $node = Route::Node::get($self->{call});
$self->send_last_pc92_config($main::routeroot);
$self->send(pc92a($main::routeroot, $node)) unless $main::routeroot->last_PC92C =~ /$self->{call}/;
# and are not themselves isolated, this to make sure that isolated nodes
# don't appear outside of this node
+ dbg("send_local_config: traditional");
+
# send locally connected nodes
my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
sub gen_pc92_update
{
my $self = shift;
- my $with_pc92_nodes = shift;
- my $node;
- my @lines;
- my @dxchan;
- my @localnodes;
-
- dbg('ROUTE: DXProt::gen_pc92_update start') if isdbg('routelow');
# send 'my' configuration for all channels
- push @lines, gen_my_pc92_config($main::routeroot);
-
-# if ($with_pc92_nodes) {
- # send out the configuration of all the directly connected 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_pc9x} } DXChannel::get_all_nodes();
-# dbg("ROUTE: pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
-# @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
-# dbg("ROUTE: pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
-# 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 directly connected '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_pc9x} } DXChannel::get_all_nodes();
-# dbg("ROUTE: non pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
-# @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
-# dbg("ROUTE: non pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
-# foreach $node (@localnodes) {
-# if ($node) {
-# push @lines, gen_my_pc92_config($node);
-# }
-# }
-
- dbg('ROUTE: DXProt::gen_pc92_update end with ' . scalar @lines . ' lines') if isdbg('routelow');
- return @lines;
+ my $l = gen_my_pc92_config($main::routeroot);
+ return $l;
}
sub send_pc92_update
{
- my @out = $main::me->gen_pc92_update(0);
+ my $self = shift;
+ my $call = shift;
- # broadcast the lines to all PC92 nodes
- for (@out) {
- $main::me->broadcast_route_pc9x($main::mycall, undef, $_, 0);
- }
+ dbg('DXProt::send_pc92_update') if isdbg('trace');
+
+ my $l = gen_my_pc92_config(Route::Node::get($call));
+ $main::me->broadcast_route_pc9x($main::mycall, undef, $l, 0);
}
sub time_out_pc92_routes