}
if (@rout) {
$self->route_pc16($origin, $line, $parent, @rout);
- $self->route_pc92a($main::mycall, undef, $parent, @rout);
+ $self->route_pc92a($main::mycall, undef, $parent, @rout) if $self->{state} eq 'normal';
}
}
# The justification for this is that most of it is wrong or out of date
# anyway.
#
- # From now on we are only going to believe PC92 data.
+ # From now on we are only going to believe PC92 data and locally connected
+ # non-pc92 nodes.
#
for ($i = 1; $i < $#_-1; $i += 4) {
my $here = $_[$i];
if (@rout) {
$self->route_pc21($self->{call}, $line, @rout);
$self->route_pc19($self->{call}, $line, @rout);
- $self->route_pc92a($main::mycall, $line, $main::routeroot, @rout);
+ $self->route_pc92a($main::mycall, $line, $main::routeroot, @rout) if $self->{state} eq 'normal';
}
}
+sub send_delayed_pc92
+{
+ my $self = shift;
+
+ # send out delayed PC92 config for this node if it is external
+ unless ($self->{do_pc92}) {
+ my $node = Route::Node::get($self->{call});
+ if ($node) {
+ my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
+ $self->route_pc92c($main::mycall, undef, $node, @rout);
+ }
+ }
+}
+
# send local configuration
sub handle_20
{
$self->send(pc22());
$self->state('normal');
$self->{lastping} = 0;
+ $self->send_delayed_pc92;
}
# delete a cluster from the list
my $origin = shift;
$self->state('normal');
$self->{lastping} = 0;
+
+ $self->send_delayed_pc92
}
# WWV info
if (!$_last_time || $_last_time != $main::systime) {
$_last_time = $main::systime;
$_last_occurs = 0;
- return $_last_time;
+ return $_last_time - $main::systime_daystart;
} else {
$_last_occurs++;
- return sprintf "$_last_time.%02d", $_last_occurs;
+ return sprintf "%d.%02d", $_last_time - $main::systime_daystart, $_last_occurs;
}
}
my $parent = ref $call ? $call : Route::Node::get($call);
if ($parent) {
my $lastid = $parent->lastid->{$pc} || 0;
+ $t += 86400 if $t < $lastid - 43200;
if ($lastid >= $t) {
dbg("PCPROT: dup / old id on $call <= $lastid, ignored") if isdbg('chanerr');
return;
}
+ $t -= 86400 if $t >= 86400;
} elsif ($create) {
$parent = Route::Node->new($call);
}
return;
}
- my $parent = check_pc9x_t($pcall, $t, 92, 1);
+ my $parent = check_pc9x_t($pcall, $t, 92, 1) || return;
$parent->lastid->{92} = $t;
$parent->do_pc92(1);
# and update any information that needs to be done.
my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($ent[0]);
if ($call && $is_node) {
+ if ($call eq $main::mycall) {
+ dbg("PCPROT: looped back on node entry, ignored") if isdbg('chanerr');
+ return;
+ }
if ($is_extnode) {
# reparent to external node (note that we must have received a 'C' or 'A' record
# from the true parent node for this external before we get one for the this node
$self->route_pc21($pcall, undef, $r) if $r->isa('Route::Node');
$self->route_pc17($pcall, undef, $parent, $r) if $r->isa('Route::User');
}
- foreach my $r (@radd) {
- next unless $r;
-
- $self->route_pc19($pcall, undef, $r) if $r->isa('Route::Node');
- $self->route_pc16($pcall, undef, $parent, $r) if $r->isa('Route::User');
- }
+ my @pc19 = grep { $_ && $_->isa('Route::Node') } @radd;
+ my @pc16 = grep { $_ && $_->isa('Route::User') } @radd;
+ $self->route_pc19($pcall, undef, @pc19) if @pc19;
+ $self->route_pc16($pcall, undef, $parent, @pc16) if @pc16;
}
# if get here then rebroadcast the thing with its Hop count decremented (if