use Route;
use Route::Node;
use Script;
-use RouteDB;
-
use strict;
$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
+ $pc92filterdef
);
$pc9x_dupe_age = 60; # catch loops of circular (usually) D records
$pc9x_time_tolerance; # thing a node might send - once an hour and we allow an extra hour for luck)
# this is actually the partition between "yesterday" and "today" but old.
+$pc92filterdef = bless ([
+ # tag, sort, field, priv, special parser
+ ['call', 'c', 0],
+ ['by', 'c', 0],
+ ['dxcc', 'nc', 1],
+ ['itu', 'ni', 2],
+ ['zone', 'nz', 3],
+ ], 'Filter::Cmd');
+
# incoming talk commands
sub handle_10
}
}
- # remember a route to this node and also the node on which this user is
- RouteDB::update($_[6], $self->{call});
-# RouteDB::update($to, $_[6]);
-
# convert this to a PC93, coming from mycall with origin set and process it as such
$main::me->normal(pc93($to, $from, $via, $_[3], $_[6]));
}
}
}
- # remember a route
-# RouteDB::update($_[7], $self->{call});
-# RouteDB::update($_[6], $_[7]);
-
my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $nossid, $_[7]);
# global spot filtering on INPUT
if ($self->{inspotsfilter}) {
#
# 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
- if (defined *Local::spot) {
+ if (defined &Local::spot) {
my $r;
eval {
$r = Local::spot($self, @spot);
$self->send_chat(0, $line, @_[1..6]);
} elsif ($_[2] eq '*' || $_[2] eq $main::mycall) {
- # remember a route
-# RouteDB::update($_[5], $self->{call});
-# RouteDB::update($_[1], $_[5]);
-
# ignore something that looks like a chat line coming in with sysop
# flag - this is a kludge...
if ($_[3] =~ /^\#\d+ / && $_[4] eq '*') {
}
# local processing
- if (defined *Local::ann) {
+ if (defined &Local::ann) {
my $r;
eval {
$r = Local::ann($self, $line, @_[1..6]);
my $h;
$h = 1 if DXChannel::get($ncall);
- RouteDB::update($ncall, $self->{call}, $h);
if ($h && $self->{call} ne $ncall) {
dbg("PCPROT: trying to update a local node, ignored") if isdbg('chanerr');
return;
# 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);
return;
}
- RouteDB::delete($ncall, $self->{call});
-
my $uref = Route::User::get($ucall);
unless ($uref) {
dbg("PCPROT: Route::User $ucall not in config") if isdbg('chanerr');
$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
# next;
# }
- RouteDB::update($call, $self->{call}, $dxchan ? 1 : undef);
unless ($h) {
if ($parent->via_pc92) {
# we don't need any isolation code here, because we will never
# act on a PC21 with self->call in it.
- RouteDB::delete($call, $self->{call});
-
my $parent = Route::Node::get($self->{call});
unless ($parent) {
dbg("PCPROT: my parent $self->{call} has disappeared");
# note this only takes the first one it gets
Geomag::update($d, $_[2], $sfi, $k, $i, @_[6..8], $r);
- if (defined *Local::wwv) {
+ if (defined &Local::wwv) {
my $rep;
eval {
$rep = Local::wwv($self, $_[1], $_[2], $sfi, $k, $i, @_[6..8], $r);
}
# 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 $call = $_[1];
- RouteDB::update($call, $self->{call});
-
my $node = Route::Node::get($call);
if ($node) {
return unless $node->call eq $self->{call};
$node->usercount($_[2]) unless $node->users;
$node->reset_obs;
+ $node->PC92C_dxchan($self->call, $_[-1]);
# input filter if required
# return unless $self->in_filter_route($node);
DXXml::Ping::handle_ping_reply($self, $from);
}
} else {
-
- RouteDB::update($from, $self->{call});
-
if (eph_dup($line)) {
return;
}
my $wcy = WCY::update($d, @_[2..12]);
- if (defined *Local::wcy) {
+ if (defined &Local::wcy) {
my $rep;
eval {
$rep = Local::wcy($self, @_[1..12]);
{
my $parent = shift;
my $s = shift;
+ my $dxchan = shift;
+ my $hops = shift;
+
my ($call, $is_node, $is_extnode, $here, $version, $build) = @$s;
my @rout;
if ($is_node) {
dbg("ROUTE: added node $call to " . $parent->call) if isdbg('routelow');
@rout = $parent->add($call, $version, Route::here($here));
+ my $r = Route::Node::get($call);
+ $r->PC92C_dxchan($dxchan->call, $hops) if $r;
} else {
dbg("ROUTE: added user $call to " . $parent->call) if isdbg('routelow');
@rout = $parent->add_user($call, Route::here($here));
} 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;
+ }
}
}
}
my $slot = shift;
my $parent = shift;
my $t = shift;
+ my $hops = shift;
my $oparent = $parent;
my @radd;
# from the true parent node for this external before we get one for the this node
unless ($parent = Route::Node::get($call)) {
if ($is_extnode && $oparent) {
- @radd = _add_thingy($oparent, $slot);
+ @radd = _add_thingy($oparent, $slot, $self, $hops);
$parent = $radd[0];
} else {
dbg("PCPROT: no previous C or A for this external node received, ignored") if isdbg('chanerr');
}
$parent = check_pc9x_t($call, $t, 92) || return;
$parent->via_pc92(1);
- $parent->PC92C_dxchan($self->{call});
+ $parent->PC92C_dxchan($self->{call}, $hops);
}
} else {
dbg("PCPROT: must be \$mycall or external node as first entry, ignored") if isdbg('chanerr');
$parent->here(Route::here($here));
$parent->version($version || $pc19_version) if $version;
$parent->build($build) if $build;
- $parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
+ $parent->PC92C_dxchan($self->{call}, $hops) unless $self->{call} eq $parent->call;
return ($parent, @radd);
}
my $pcall = $_[1];
my $t = $_[2];
my $sort = $_[3];
+ my $hops = $_[-1];
# this catches loops of A/Ds
# if (eph_dup($line, $pc9x_dupe_age)) {
}
} 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;
+ $parent->PC92C_dxchan($self->{call}, $hops) unless $self->{call} eq $parent->call;
my @ent = _decode_pc92_call($_[4]);
if (@ent) {
my $add;
- ($parent, $add) = $self->pc92_handle_first_slot(\@ent, $parent, $t);
+ ($parent, $add) = $self->pc92_handle_first_slot(\@ent, $parent, $t, $hops);
return unless $parent; # dupe
push @radd, $add if $add;
$pc92Din += length $line if $sort eq 'D';
# remember the last channel we arrived on
- $parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
+ $parent->PC92C_dxchan($self->{call}, $hops) unless $self->{call} eq $parent->call;
# this is the main route section
# here is where all the routes are created and destroyed
# that needs to be done.
my $add;
- ($parent, $add) = $self->pc92_handle_first_slot($ent[0], $parent, $t);
+ ($parent, $add) = $self->pc92_handle_first_slot($ent[0], $parent, $t, $hops);
return unless $parent; # dupe
shift @ent;
if ($sort eq 'A') {
for (@nent) {
- push @radd, _add_thingy($parent, $_);
+ push @radd, _add_thingy($parent, $_, $self, $hops);
}
} elsif ($sort eq 'D') {
for (@nent) {
foreach my $r (@nent) {
my $call = $r->[0];
if ($call) {
- push @radd,_add_thingy($parent, $r) if grep $call eq $_, (@$nnodes, @$nusers);
+ push @radd,_add_thingy($parent, $r, $self, $hops) if grep $call eq $_, (@$nnodes, @$nusers);
}
}
# del users here
projects / spider.git / blobdiff