use strict;
+use vars qw($VERSION $BRANCH);
+($VERSION, $BRANCH) = dxver(q$Revision$);
+
use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
$last_hour $last10 %eph %pings %rcmds $ann_to_talk
$pingint $obscount %pc19list $chatdupeage $chatimportfn
}
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
my $icall = shift;
my @part = split /:/, $icall;
my ($flag, $call) = unpack "A A*", $part[0];
- return () unless $flag && $flag ge '0' && $flag le '7';
+ return () unless defined $flag && $flag ge '0' && $flag le '7';
return () unless $call && is_callsign($call);
my $is_node = $flag & 4;
my $is_extnode = $flag & 2;
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;
}
}
return;
}
- my $parent = check_pc9x_t($pcall, $t, 92, 1);
- return unless $parent;
+ my $parent = check_pc9x_t($pcall, $t, 92, 1) || return;
$parent->lastid->{92} = $t;
$parent->do_pc92(1);
$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