# if there is a parent, proceed, otherwise if there is a latent PC19 in the PC19list,
# fix it up in the routing tables and issue it forth before the PC16
- unless ($parent) {
+ if ($parent) {
$dxchan = $parent->dxchan;
if ($dxchan && $dxchan ne $self) {
dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
}
# is he under the control of the new protocol?
- if ($parent && $parent->np) {
- dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr');
- return;
- }
+# if ($parent && $parent->np) {
+# dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr');
+# return;
+# }
my $i;
my @rout;
my $uref = Route::User::get($ucall);
unless ($uref) {
dbg("PCPROT: Route::User $ucall not in config") if isdbg('chanerr');
+ return;
}
my $parent = Route::Node::get($ncall);
unless ($parent) {
dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chanerr');
+ return;
}
- $dxchan = $parent->dxchan if $parent;
+ $dxchan = $parent->dxchan;
if ($dxchan && $dxchan ne $self) {
dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
return;
}
# is he under the control of the new protocol?
- if ($parent && $parent->np) {
- dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr');
- return;
- }
+# if ($parent && $parent->np) {
+# dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr');
+# return;
+# }
# input filter if required and then remove user if present
- if ($parent) {
+ if ($parent && !$parent->np) {
# return unless $self->in_filter_route($parent);
$parent->del_user($uref) if $uref;
- } else {
- $parent = Route->new($ncall); # throw away
- }
+ }
if (eph_dup($line)) {
dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
return;
}
- $uref = Route->new($ucall) unless $uref; # throw away
$self->route_pc17($origin, $line, $parent, $uref) if (DXChannel::get($parent->call) || $parent->np);
}
return;
}
- # if the origin isn't the same as the INTERFACE, then reparent, creating nodes as necessary
- if ($origin ne $self->call) {
- my $op = Route::Node::get($origin);
- unless ($op) {
- $op = $parent->add($origin, 5000, 1);
- my $user = DXUser->get_current($origin);
- if (!$user) {
- $user = DXUser->new($origin);
- $user->priv(1); # I have relented and defaulted nodes
- $user->lockout(1);
- $user->homenode($origin);
- $user->node($origin);
- $user->wantroutepc19(1);
- }
- $user->sort('A') unless $user->is_node;
- $user->put;
- }
- $parent = $op;
- }
-
# parse the PC19
for ($i = 1; $i < $#_-1; $i += 4) {
my $here = $_[$i];
# check for sane parameters
# $ver = 5000 if $ver eq '0000';
- next if $ver < 5000; # only works with version 5 software
+ next unless $ver > 5000; # only works with version 5 software that isn't a passive node
next if length $call < 3; # min 3 letter callsigns
next if $call eq $main::mycall;
RouteDB::update($call, $origin);
- # do we believe this call?
my $genline = "PC19^$here^$call^$conf^$ver^$_[-1]^";
-# unless ($call eq $origin || $self->is_believed($call)) {
-# my $pt = $user->lastping($origin) || 0;
-# if ($pt+$investigation_int < $main::systime && !Investigate::get($call, $origin)) {
-# my $ivp = Investigate->new($call, $origin);
-# $ivp->version($ver);
-# $ivp->here($here);
-# $ivp->store_pcxx($pcno,$genline,$origin,'PC19',$here,$call,$conf,$ver,$_[-1]);
-# } else {
-# dbg("PCPROT: We don't believe $call on $origin") if isdbg('chanerr');
-# }
-# $user->put;
-# next;
-# }
-
if (eph_dup($genline)) {
dbg("PCPROT: dup PC19 for $call detected") if isdbg('chanerr');
next;
my $r = Route::Node::get($call);
my $flags = $here;
- # is he under the control of the new protocol?
- if ($r && $r->np) {
+ # is he under the control of the new protocol and not my interface call?
+ if ($call ne $origin && $r && $r->np) {
dbg("PCPROT: $call aranea node, ignored") if isdbg('chanerr');
next;
}
} else {
next;
}
+ } else {
+ if ($r->version != $ver || $r->flags != $flags) {
+ $r->version($ver);
+ $r->flags($flags);
+ push @rout, $r;
+ }
}
} else {
}
# we only output information that we regard as reliable
- @rout = grep {$_ && (DXChannel::get{$_->{call}} || $_->np) } @rout;
+ @rout = grep {$_ && (DXChannel::get($_->{call}) || $_->np) } @rout;
$self->route_pc19($origin, $line, @rout) if @rout;
}
return;
}
- @rout = grep {$_ && (DXChannel::get{$_->{call}} || $_->np) } @rout;
+ @rout = grep {$_ && (DXChannel::get($_->{call}) || $_->np) } @rout;
$self->route_pc21($origin, $line, @rout) if @rout;
}
for $node (@intcalls) {
push @remotenodes, Route::Node::get($node) unless grep $node eq $_, @rnodes, @remotenodes;
}
- @remotenodes = grep {$_ && (DXChannel::get{$_->{call}} || $_->np) } @remotenodes;
+ @remotenodes = grep {$_ && (DXChannel::get($_->{call}) || $_->np) } @remotenodes;
$self->send_route($main::mycall, \&pc19, scalar(@remotenodes), @remotenodes);
}