#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
-# $Id$
+#
#
package DXProt;
$investigation_int $pc19_version $myprot_version
%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
$allowzero $decode_dk0wcy $send_opernam @checklist
- $eph_pc15_restime $pc92_update_period $last_pc92_update
- %pc92_find $pc92_find_timeout
+ $eph_pc15_restime $pc92_update_period $pc92_obs_timeout
+ %pc92_find $pc92_find_timeout $pc92_short_update_period
);
$pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11
$chatimportfn = "$main::root/chat_import";
$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 = 30*60; # the period between PC92 C updates
-$last_pc92_update = time + int rand(180); # the last time a PC92 config update
+$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
return 0;
}
+sub update_pc92_next
+{
+ my $self = shift;
+ my $period = shift || $pc92_update_period;
+ $self->{next_pc92_update} = $main::systime + $period - int rand($period / 4);
+}
+
sub init
{
do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
$main::me->{version} = $main::version;
$main::me->{build} = "$main::subversion.$main::build";
$main::me->{do_pc9x} = 1;
+ $main::me->update_pc92_next($pc92_update_period);
}
#
# run a script send the output to the debug file
my $script = new Script(lc $call) || new Script('node_default');
$script->run($self) if $script;
+
+ # set next_pc92_update time for this node sooner
+ $self->update_pc92_next($pc92_short_update_period);
}
#
$dxchan->{lastping} += $dxchan->{pingint} / 2 unless @{$dxchan->{pingtime}};
}
}
+
+ # send out a PC92 config record if required
+ if ($main::systime >= $dxchan->{next_pc92_update}) {
+ if ($dxchan->{call} eq $main::mycall || !$dxchan->{do_pc9x}) {
+ $dxchan->send_pc92_update($dxchan->{call});
+ }
+ $dxchan->update_pc92_next($pc92_update_period);
+ }
}
Investigate::process();
eph_clean();
import_chat();
- if ($main::systime >= $last_pc92_update + $pc92_update_period) {
- dbg("ROUTE: sending pc92 update") if isdbg('route');
- send_pc92_update();
+ if ($main::systime >= $pc92_obs_timeout) {
time_out_pc92_routes();
- $last_pc92_update = $main::systime + int rand(5*60);
+ $pc92_obs_timeout = $main::systime + $pc92_update_period;
}
$last10 = $t;
dbg('DXProt::send_local_config') if isdbg('trace');
# send our nodes
- if ($self->{do_pc9x}) {
- $self->send_pc92_config;
+ my $node;
+ my @nodes;
+ my @localnodes;
+ 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}/;
} else {
- my $node;
- my @nodes;
- my @localnodes;
- my @remotenodes;
+ # create a list of all the nodes that are not connected to this connection
+ # and are not themselves isolated, this to make sure that isolated nodes
+ # don't appear outside of this node
- if ($self->{isolate}) {
- @localnodes = ( $main::routeroot );
- $self->send_route($main::mycall, \&pc19, 1, $main::routeroot);
- } else {
- # create a list of all the nodes that are not connected to this connection
- # and are not themselves isolated, this to make sure that isolated nodes
- # don't appear outside of this node
-
- # 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;
- $self->send_route($main::mycall, \&pc19, scalar(@localnodes)+1, $main::routeroot, @localnodes);
-
- my $node;
- my @rawintcalls = map { $_->nodes } @localnodes if @localnodes;
- my @intcalls;
- for $node (@rawintcalls) {
- push @intcalls, $node unless grep $node eq $_, @intcalls;
- }
- my $ref = Route::Node::get($self->{call});
- my @rnodes = $ref->nodes;
- for $node (@intcalls) {
- push @remotenodes, Route::Node::get($node) unless grep $node eq $_, @rnodes, @remotenodes;
- }
- $self->send_route($main::mycall, \&pc19, scalar(@remotenodes), @remotenodes);
+ 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;
+ $self->send_route($main::mycall, \&pc19, scalar(@localnodes)+1, $main::routeroot, @localnodes);
+
+ my $node;
+ my @rawintcalls = map { $_->nodes } @localnodes if @localnodes;
+ my @intcalls;
+ for $node (@rawintcalls) {
+ push @intcalls, $node unless grep $node eq $_, @intcalls;
+ }
+ my $ref = Route::Node::get($self->{call});
+ my @rnodes = $ref->nodes;
+ for $node (@intcalls) {
+ push @remotenodes, Route::Node::get($node) unless grep $node eq $_, @rnodes, @remotenodes;
}
+ $self->send_route($main::mycall, \&pc19, scalar(@remotenodes), @remotenodes);
+ }
- # get all the users connected on the above nodes and send them out
+ # get all the users connected on the above nodes and send them out
+ unless ($self->{do_pc9x}) {
foreach $node ($main::routeroot, @localnodes, @remotenodes) {
if ($node) {
my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
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);
- }
- }
- }
+ my $l = gen_my_pc92_config($main::routeroot);
+ return $l;
+}
- # 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;
+sub send_last_pc92_config
+{
+ my $self = shift;
+ my $node = shift;
+ if (my $l = $node->last_PC92C) {
+ $self->send($l);
+ } else {
+ $self->send_pc92_config($node);
+ }
}
-
sub send_pc92_config
{
my $self = shift;
+ my $node = shift;
dbg('DXProt::send_pc92_config') if isdbg('trace');
- my @out = $self->gen_pc92_update(1);
-
- # send the complete config out on this interface
- for (@out) {
- $self->send($_);
- }
+ $node->last_PC92C(gen_my_pc92_config($node));
+ $self->send($node->last_PC92C);
}
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
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');
+ dbg("disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('obscount');
$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');
+ dbg("deleting pc92 $_->{call} from $n->{call} on obscount") if isdbg('obscount');
push @rdel, $n->del($_);
}
}
} else {
- dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('route');
+ dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('obscount');
}
}
for (@rdel) {
if ($filter) {
push @rin, $r;
} else {
- dbg("DXPROT: $self->{call}/" . $r->call . " rejected by output filter") if isdbg('chanerr');
+ dbg("PCPROT: $self->{call}/" . $r->call . " rejected by output filter") if isdbg('filter');
}
} else {
dbg("was sent a null value") if isdbg('chanerr');
}
}
+# broadcast everywhere
sub broadcast_route
{
my $self = shift;
}
unless ($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->isa('DXProt');
+
+ $dxchan->send_route($origin, $generate, @_);
+ }
+ }
+}
+
+# broadcast to non-pc9x nodes
+sub broadcast_route_nopc9x
+{
+ my $self = shift;
+ my $origin = shift;
+ my $generate = shift;
+ my $line = shift;
+ my @dxchan = DXChannel::get_all_nodes();
+ my $dxchan;
+
+ if ($line) {
+ $line =~ /\^H(\d+)\^?\~?$/;
+ return unless $1 > 0;
+ }
+ unless ($self->{isolate}) {
+ foreach $dxchan (@dxchan) {
+ 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->isa('DXProt');
next if $dxchan->{do_pc9x};
next if ($generate == \&pc16 || $generate==\&pc17) && !$dxchan->user->wantsendpc16;
$self->send($line);
}
+# broadcast only to pc9x nodes
sub broadcast_route_pc9x
{
my $self = shift;
foreach $dxchan (@dxchan) {
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_pc9x};
next unless $dxchan->isa('DXProt');
+ next unless $dxchan->{do_pc9x};
$dxchan->send($line);
}
return unless $self->user->wantpc16;
my $origin = shift;
my $line = shift;
- broadcast_route($self, $origin, \&pc16, $line, 1, @_);
+ broadcast_route_nopc9x($self, $origin, \&pc16, $line, 1, @_);
}
sub route_pc17
return unless $self->user->wantpc16;
my $origin = shift;
my $line = shift;
- broadcast_route($self, $origin, \&pc17, $line, 1, @_);
+ broadcast_route_nopc9x($self, $origin, \&pc17, $line, 1, @_);
}
sub route_pc19
my $self = shift;
my $origin = shift;
my $line = shift;
- broadcast_route($self, $origin, \&pc19, $line, scalar @_, @_);
+ broadcast_route_nopc9x($self, $origin, \&pc19, $line, scalar @_, @_);
}
sub route_pc21
my $self = shift;
my $origin = shift;
my $line = shift;
- broadcast_route($self, $origin, \&pc21, $line, scalar @_, @_);
+ broadcast_route_nopc9x($self, $origin, \&pc21, $line, scalar @_, @_);
}
sub route_pc24