$allowzero $decode_dk0wcy $send_opernam @checklist
$eph_pc15_restime $pc92_update_period $pc92_obs_timeout
%pc92_find $pc92_find_timeout $pc92_short_update_period
+ $next_pc92_obs_timeout
);
$pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11
$eph_pc34_restime = 30;
$pingint = 5*60;
$obscount = 2;
-$chatdupeage = 20 * 60 * 60;
+$chatdupeage = 20 * 60;
$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 = 60*60; # the period between PC92 C updates
+$pc92_update_period = 60*60; # the period between outgoing 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
+#$pc92_obs_timeout = $pc92_update_period; # the time between obscount countdowns
+$pc92_obs_timeout = 60*60; # the time between obscount for incoming countdowns
+$next_pc92_obs_timeout = $main::systime + 60*60; # the time between obscount countdowns
my $self = shift;
my $period = shift || $pc92_update_period;
$self->{next_pc92_update} = $main::systime + $period - int rand($period / 4);
+ dbg("ROUTE: update_pc92_next: $self->{call} " . atime($self->{next_pc92_update})) if isdbg('obscount');
}
sub init
$script->run($self) if $script;
# set next_pc92_update time for this node sooner
- $self->update_pc92_next($pc92_short_update_period);
+ $self->update_pc92_next($self->{outbound} ? $pc92_short_update_period : $pc92_update_period);
}
#
sub sendinit
{
my $self = shift;
- $self->send(pc18());
+ $self->send(pc18(($self->{isolate} || !$self->user->wantpc9x) ? "" : " pc9x"));
}
#
eph_clean();
import_chat();
- if ($main::systime >= $pc92_obs_timeout) {
+ if ($main::systime >= $next_pc92_obs_timeout) {
time_out_pc92_routes();
- $pc92_obs_timeout = $main::systime + $pc92_update_period;
+ $next_pc92_obs_timeout = $main::systime + $pc92_obs_timeout;
}
$last10 = $t;
# send out a PC92 config record if required for me and
# all my non pc9x dependent nodes.
if ($main::systime >= $dxchan->{next_pc92_update}) {
- if ($dxchan->{call} eq $main::mycall || !$dxchan->{do_pc9x}) {
- $dxchan->send_pc92_update($dxchan->{call});
+ dbg("ROUTE: pc92 broadcast candidate: $dxchan->{call}") if isdbg('obscount');
+ if ($dxchan == $main::me || !$dxchan->{do_pc9x}) {
+ $dxchan->broadcast_pc92_update($dxchan->{call});
}
- $dxchan->update_pc92_next($pc92_update_period);
}
}
}
my $target = $_[6];
my $to = 'To ';
my $text = unpad($_[2]);
+ my $from = $_[0];
if ($_[3] eq '*') { # sysops
$target = "SYSOP";
# obtain country codes etc
- my @a = Prefix::cty_data($_[0]);
+ my @a = Prefix::cty_data($from);
my @b = Prefix::cty_data($_[4]);
if ($self->{inannfilter}) {
my ($filter, $hops) =
}
}
- if (AnnTalk::dup($_[0], $_[1], $_[2])) {
- dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
- return;
+ if (AnnTalk::dup($from, $target, $_[2])) {
+ my $dxchan = DXChannel::get($from);
+ if ($self == $main::me && $dxchan && $dxchan->is_user) {
+ if ($dxchan->priv < 5) {
+ $dxchan->send($dxchan->msg('dup'));
+ return;
+ }
+ } else {
+ dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+ return;
+ }
}
- Log('ann', $target, $_[0], $text);
+ Log('ann', $target, $from, $text);
# send it if it isn't the except list and isn't isolated and still has a hop count
# taking into account filtering and so on
}
}
-my $msgid = 0;
+my $msgid = int rand(1000);
sub nextchatmsgid
{
my $target = $_[3];
my $text = unpad($_[2]);
my $ak1a_line;
+ my $from = $_[0];
# munge the group and recast the line if required
if ($target =~ s/\.LST$//) {
}
# obtain country codes etc
- my @a = Prefix::cty_data($_[0]);
+ my @a = Prefix::cty_data($from);
my @b = Prefix::cty_data($_[4]);
if ($self->{inannfilter}) {
my ($filter, $hops) =
}
}
- if (AnnTalk::dup($_[0], $_[1], $_[2], $chatdupeage)) {
- dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
- return;
+ if (AnnTalk::dup($from, $target, $_[2], $main::systime + $chatdupeage)) {
+ my $dxchan = DXChannel::get($from);
+ if ($self == $main::me && $dxchan && $dxchan->is_user) {
+ if ($dxchan->priv < 5) {
+ $dxchan->send($dxchan->msg('dup'));
+ return;
+ }
+ } else {
+ dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+ return;
+ }
}
- Log('chat', $target, $_[0], $text);
+ Log('chat', $target, $from, $text);
# send it if it isn't the except list and isn't isolated and still has a hop count
# taking into account filtering and so on
dbg("ROUTE: all dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
dbg("ROUTE: localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
- return pc92c($main::routeroot, @localnodes);
+ return pc92c($node, @localnodes);
} else {
my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
return pc92c($node, @rout);
}
}
-sub gen_pc92_update
-{
- my $self = shift;
-
- # send 'my' configuration for all channels
- my $l = gen_my_pc92_config($main::routeroot);
- return $l;
-}
-
-
sub send_last_pc92_config
{
my $self = shift;
$self->send($node->last_PC92C);
}
-sub send_pc92_update
+sub broadcast_pc92_update
{
my $self = shift;
my $call = shift;
- dbg('DXProt::send_pc92_update') if isdbg('trace');
+ dbg("ROUTE: broadcast_pc92_update $call") if isdbg('obscount');
- my $l = gen_my_pc92_config(Route::Node::get($call));
+ my $nref = Route::Node::get($call);
+ my $l = $nref->last_PC92C(gen_my_pc92_config($nref));
$main::me->broadcast_route_pc9x($main::mycall, undef, $l, 0);
+ $self->update_pc92_next($pc92_update_period);
}
sub time_out_pc92_routes
my $o = $n->dec_obs;
if ($o <= 0) {
if (my $dxchan = DXChannel::get($n->call)) {
- dbg("disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('obscount');
+ dbg("ROUTE: 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("deleting pc92 $_->{call} from $n->{call} on obscount") if isdbg('obscount');
+ dbg("ROUTE: deleting pc92 $_->{call} from $n->{call} on obscount") if isdbg('obscount');
push @rdel, $n->del($_);
}
}
projects / spider.git / blobdiff