$investigation_int $pc19_version $myprot_version
%nodehops $baddx $badspotter $badnode $censorpc
$allowzero $decode_dk0wcy $send_opernam @checklist
- $eph_pc15_restime $pc9x_past_age
+ $eph_pc15_restime $pc9x_past_age $pc9x_dupe_age
$pc10_dupe_age $pc92_slug_changes $last_pc92_slug
$pc92Ain $pc92Cin $pc92Din $pc92Kin $pc9x_time_tolerance
);
+$pc9x_dupe_age = 60; # catch loops of circular (usually) D records
$pc10_dupe_age = 45; # just something to catch duplicate PC10->PC93 conversions
$pc92_slug_changes = 60; # slug any changes going outward for this long
$last_pc92_slug = 0; # the last time we sent out any delayed add or del PC92s
#
# fix up qra locators of known users
- my $user = DXUser->get_current($spot[4]);
+ my $user = DXUser::get_current($spot[4]);
if ($user) {
my $qra = $user->qra;
unless ($qra && is_qra($qra)) {
}
# local processing
- my $r;
- eval {
- $r = Local::spot($self, @spot);
- };
- # dbg("Local::spot1 error $@") if isdbg('local') if $@;
- return if $r;
+ if (defined &Local::spot) {
+ my $r;
+ eval {
+ $r = Local::spot($self, @spot);
+ };
+ return if $r;
+ }
# DON'T be silly and send on PC26s!
return if $pcno == 26;
} else {
$self->route($_[2], $line);
}
+
+ # local processing
+ if (defined &Local::ann) {
+ my $r;
+ eval {
+ $r = Local::ann($self, $line, @_[1..6]);
+ };
+ return if $r;
+ }
}
sub handle_15
# reject this if we think it is a node already
my $r = Route::Node::get($call);
- my $u = DXUser->get_current($call) unless $r;
+ my $u = DXUser::get_current($call) unless $r;
if ($r || ($u && $u->is_node)) {
dbg("PCPROT: $call is a node") if isdbg('chanerr');
next;
}
# add this station to the user database, if required
- my $user = DXUser->get_current($ncall);
+ my $user = DXUser::get_current($ncall);
$user = DXUser->new($call) unless $user;
$user->homenode($parent->call) if !$user->homenode;
$user->node($parent->call);
$parent->del_user($uref);
# send info to all logged in thingies
- my $user = DXUser->get_current($ncall);
+ my $user = DXUser::get_current($ncall);
$self->tell_login('logoutu', "$ncall: $ucall") if $user && $user->is_local_node;
$self->tell_buddies('logoutb', $ucall, $ncall);
my $call = shift;
# add this station to the user database, if required (don't remove SSID from nodes)
- my $user = DXUser->get_current($call);
+ my $user = DXUser::get_current($call);
if (!$user) {
$user = DXUser->new($call);
$user->priv(1); # I have relented and defaulted nodes
# note this only takes the first one it gets
Geomag::update($d, $_[2], $sfi, $k, $i, @_[6..8], $r);
- my $rep;
- eval {
- $rep = Local::wwv($self, $_[1], $_[2], $sfi, $k, $i, @_[6..8], $r);
- };
- # dbg("Local::wwv2 error $@") if isdbg('local') if $@;
- return if $rep;
+ if (defined &Local::wwv) {
+ my $rep;
+ eval {
+ $rep = Local::wwv($self, $_[1], $_[2], $sfi, $k, $i, @_[6..8], $r);
+ };
+ return if $rep;
+ }
# DON'T be silly and send on PC27s!
return if $pcno == 27;
}
# add this station to the user database, if required
- my $user = DXUser->get_current($call);
+ my $user = DXUser::get_current($call);
$user = DXUser->new($call) unless $user;
if ($sort == 1) {
my $wcy = WCY::update($d, @_[2..12]);
- my $rep;
- eval {
- $rep = Local::wcy($self, @_[1..12]);
- };
- # dbg("Local::wcy error $@") if isdbg('local') if $@;
- return if $rep;
+ if (defined &Local::wcy) {
+ my $rep;
+ eval {
+ $rep = Local::wcy($self, @_[1..12]);
+ };
+ return if $rep;
+ }
# broadcast to the eager world
send_wcy_spot($self, $line, $d, @_[2..12]);
# and old dupes with $t = 234, $lastid = 256 (which give answers 249 and
# 86378 respectively in the calculation below).
#
- if (($t-$lastid)%86400 > $pc9x_past_age) {
+ if ($t+86400-$lastid > $pc9x_past_age) {
dbg("PCPROT: dup id on $t <= lastid $lastid, ignored") if isdbg('chanerr') || isdbg('pc92dedupe');
return undef;
}
} elsif ($t == $lastid) {
dbg("PCPROT: dup id on $t == lastid $lastid, ignored") if isdbg('chanerr') || isdbg('pc92dedupe');
return undef;
+ } else {
+ # check that if we have a low number in lastid that yesterday's numbers
+ # (likely in the 85000+ area) don't override them, thus causing flip flopping
+ if ($lastid+86400-$t < $pc9x_past_age) {
+ dbg("PCPROT: dup id on $t in yesterday, lastid $lastid, ignored") if isdbg('chanerr') || isdbg('pc92dedupe');
+ return undef;
+ }
}
}
}
} elsif ($create) {
$parent = Route::Node->new($call);
} else {
+ dbg("PCPROT: $call does not exist, ignored") if isdbg('pc92dedupe');
return undef;
}
if (isdbg('pc92dedupe')) {
my $t = $_[2];
my $sort = $_[3];
+ # this catches loops of A/Ds
+# if (eph_dup($line, $pc9x_dupe_age)) {
+# return;
+# }
+
if ($pcall eq $main::mycall) {
dbg("PCPROT: looped back, ignored") if isdbg('chanerr');
return;
return;
}
- my $parent = check_pc9x_t($pcall, $t, 92, 1) || return;
+ # don't create routing entries for D records that don't already exist
+ # this is what causes all those PC92 loops!
+ my $parent = check_pc9x_t($pcall, $t, 92, $sort ne 'D') || return;
my $oparent = $parent;
$parent->do_pc9x(1);
}
} elsif ($sort eq 'K') {
- $pc92Kin += length $line if $sort eq 'K';
+ $pc92Kin += length $line;
# remember the last channel we arrived on
$parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
return;
}
+ # ignore PC93 coming in from outside this node with a target of local
+ if ($to eq 'LOCAL' && $self != $main::me) {
+ dbg("PCPROT: incoming LOCAL chat not from local node, ignored") if isdbg('chanerr');
+ return;
+ }
+
# if it is routeable then then treat it like a talk
my $ref = Route::get($to);
if ($ref) {
# chat messages to non-pc9x nodes
$self->send_chat(1, pc12($from, $text, undef, $to, undef, $pcall), $from, '*', $text, $to, $pcall, '0');
}
- $self->broadcast_route_pc9x($pcall, undef, $line, 0);
+
+ # broadcast this chat sentence everywhere unless it is targetted to 'LOCAL'
+ $self->broadcast_route_pc9x($pcall, undef, $line, 0) unless $to eq 'LOCAL' || $via eq 'LOCAL';
}
# if get here then rebroadcast the thing with its Hop count decremented (if