use Route;
use Route::Node;
use Script;
-use RouteDB;
-
use strict;
}
}
- # 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}) {
$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 '*') {
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;
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');
# 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");
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 $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));
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)) {
$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