use strict;
use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
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
$eph_pc15_restime $pc92_update_period $last_pc92_update
);
+($VERSION, $BRANCH) = dxver(q$Revision$);
+
$pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11
$pc23_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc23
$main::me->{registered} = 1;
$main::me->{version} = $main::version;
$main::me->{build} = $main::build;
+ $main::me->{do_pc92} = 1;
+ $main::me->{via_pc92} = 1;
}
#
import_chat();
if ($main::systime >= $last_pc92_update + $pc92_update_period) {
+ dbg("ROUTE: sending pc92 update") if isdbg('route');
send_pc92_update();
+ time_out_pc92_routes();
$last_pc92_update = $main::systime + int rand(180);
}
my $node;
my @lines;
- dbg('DXProt::send_pc92_update') if isdbg('trace');
+ dbg('DXProt::gen_pc92_update') if isdbg('trace');
# send 'my' configuration for all users and pc92 capable nodes
my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all();
my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
-# push @localnodes, map { my $r = Route::Node::get($_->{call}); $r ? $r : () } DXChannel::get_all_users();
push @lines, pc92c($main::routeroot, @localnodes);
if ($with_pc92_nodes) {
- # send out the configuration of all the PC92 nodes with current configuration
+ # 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_pc92} } DXChannel::get_all_nodes();
@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
}
}
- # send the configuration of all the 'external' nodes that don't handle PC92
+ # 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_pc92} } DXChannel::get_all_nodes();
@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
# broadcast the lines to all PC92 nodes
for (@out) {
- $main::me->broadcast_route_pc9x('', undef, $_, 0);
+ $main::me->broadcast_route_pc9x($main::mycall, undef, $_, 0);
}
}
+sub time_out_pc92_routes
+{
+ my @nodes = grep {$_->call ne $main::mycall && ($_->do_pc92 || $_->via_pc92)} Route::Node::get_all();
+ my @rdel;
+ foreach my $n (@nodes) {
+ my $o = $n->dec_obs;
+ if ($o <= 0) {
+ if (my $dxchan = DXChannel::get($n->call)) {
+ dbg("ROUTE: disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('route');
+ $dxchan->disconnect;
+ next;
+ }
+ my @parents = map {Route::Node::get($_)} $n->parents;
+ for (@parents) {
+ if ($_) {
+ dbg("ROUTE: deleting pc92 $_->{call} from $n->{call} on obscount") if isdbg('route');
+ push @rdel, $n->del($_);
+ }
+ }
+ } else {
+ dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('route');
+ }
+ }
+ for (@rdel) {
+ $main::me->route_pc21($main::mycall, undef, $_) if $_;
+ }
+}
+
#
# route a message down an appropriate interface for a callsign
#
my @dxchan = DXChannel::get_all_nodes();
my $dxchan;
- if ($origin eq $main::mycall) {
+ if ($origin eq $main::mycall && $generate && !$line) {
$line = &$generate(@_);
}
$line =~ /\^H(\d+)\^\~?$/;
unless ($1 > 0 && $self->{isolate}) {
foreach $dxchan (@dxchan) {
- next if $dxchan == $self;
- next if $dxchan == $main::me;
+ next if $dxchan == $self || $dxchan == $main::me;
+ next if $origin eq $dxchan->{call}; # don't route some from this call back again.
next unless $dxchan->{do_pc92};
next unless $dxchan->isa('DXProt');