use Route;
use Route::Node;
use Script;
-use Investigate;
use RouteDB;
$investigation_int $pc19_version $myprot_version
%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
$allowzero $decode_dk0wcy $send_opernam @checklist
+ $eph_pc15_restime
);
# incoming talk commands
$self->route($_[2], $line);
}
}
+
+sub handle_15
+{
+ my $self = shift;
+ my $pcno = shift;
+ my $line = shift;
+ my $origin = shift;
+
+ if (eph_dup($line, $eph_pc15_restime)) {
+ dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr');
+ } else {
+ unless ($self->{isolate}) {
+ DXChannel::broadcast_nodes($line, $self) if $line =~ /\^H\d+\^?~?$/; # send it to everyone but me
+ }
+ }
+}
# incoming user
sub handle_16
$user->lastin($main::systime) unless DXChannel::get($call);
$user->put;
}
- $self->route_pc16($origin, $line, $parent, @rout) if @rout;
-
+ if (@rout) {
+ $self->route_pc16($origin, $line, $parent, @rout);
+ $self->route_pc92a($main::mycall, undef, $parent, @rout);
+ }
}
# remove a user
$uref = Route->new($ucall) unless $uref; # throw away
$self->route_pc17($origin, $line, $parent, $uref);
+ $self->route_pc92d($main::mycall, undef, $parent, $uref);
}
# link request
if (@rout) {
$self->route_pc21($self->{call}, $line, @rout);
$self->route_pc19($self->{call}, $line, @rout);
- $self->route_pc92a($main::mycall, $line, @rout);
+ $self->route_pc92a($main::mycall, $line, $main::routeroot, @rout);
}
}
if (@rout) {
$self->route_pc21($origin, $line, @rout);
- $self->route_pc92d($main::mycall, $line, @rout);
+ $self->route_pc92d($main::mycall, $line, $main::routeroot, @rout);
}
}
$flag |= $ref->here ? 1 : 0;
if ($ref->isa('Route::Node') || $ref->isa('DXProt')) {
$flag |= 4;
- $flag |= 2 if $call ne $main::mycall && DXChannel::get($call);
+ my $dxchan = DXChannel::get($call);
+ $flag |= 2 if $call ne $main::mycall && $dxchan && !$dxchan->{do_pc92};
if ($ext) {
if ($ref->version) {
my $version = $ref->version || 1.0;
return @rout;
}
+my $_last_time;
+my $_last_occurs;
+
+sub gen_pc9x_t
+{
+ if (!$_last_time || $_last_time != $main::systime) {
+ $_last_time = $main::systime;
+ $_last_occurs = 0;
+ return $_last_time;
+ } else {
+ $_last_occurs++;
+ return sprintf "$_last_time.%02d", $_last_occurs;
+ }
+}
+
+sub check_pc9x_t
+{
+ my $call = shift;
+ my $t = shift;
+ my $pc = shift;
+ my $create = shift;
+
+ my $parent = ref $call ? $call : Route::Node::get($call);
+ if ($parent) {
+ my $lastid = $parent->lastid->{$pc} || 0;
+ if ($lastid >= $t) {
+ dbg("PCPROT: dup / old id on $call <= $lastid, ignored") if isdbg('chanerr');
+ return;
+ }
+ } elsif ($create) {
+ $parent = Route::Node->new($call);
+ }
+ $parent->lastid->{$pc} = $t;
+
+ return $parent;
+}
+
# DXSpider routing entries
sub handle_92
{
$self->{do_pc92} ||= 1;
- my ($pcall, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_[1]);
+ my $pcall = $_[1];
unless ($pcall) {
dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr');
return;
my $t = $_[2];
my $sort = $_[3];
+ my @ent = grep {$_ && /^[0-7]/} @_[4 .. $#_];
+
if ($pcall eq $main::mycall) {
dbg("PCPROT: looped back, ignored") if isdbg('chanerr');
return;
}
- my $parent = Route::Node::get($pcall);
- if ($parent) {
- my $lastid = $parent->lastid->{92} || 0;
- if ($lastid > $t) {
- dbg("PCPROT: dup / old id <= $lastid, ignored") if isdbg('chanerr');
+ my $parent = check_pc9x_t($pcall, $t, 92, 1);
+
+ $parent->lastid->{92} = $t;
+ $parent->do_pc92(1);
+
+ if (@ent) {
+
+ # look at the first one which will always be a node of some sort
+ # and update any information that needs to be done.
+ my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($ent[0]);
+ if ($call && $is_node) {
+ if ($is_extnode) {
+ # reparent to external node (note that we must have received a 'C' or 'A' record
+ # from the true parent node for this external before we get one for the this node
+ unless ($parent = Route::Node::get($call)) {
+ dbg("PCPROT: no previous C or A for this external node received, ignored") if isdbg('chanerr');
+ return;
+ }
+ my $parent = check_pc9x_t($call, $t, 92) || return;
+ }
+ } else {
+ dbg("PCPROT: must be mycall or external node as first entry, ignored") if isdbg('chanerr');
return;
}
- $parent->flags(Route::here($here));
- $parent->version($version) if $version;
- } else {
- $parent = Route::Node->new($pcall, $version, Route::here($here));
+ $parent->here(Route::here($here));
+ $parent->version($version) if $version && $version > $parent->version;
+ $parent->build($build) if $build && $build > $parent->build;
+ shift @ent;
}
- $parent->lastid->{92} = $t;
- $parent->build($build) if $build;
my (@radd, @rdel);
if ($sort eq 'A') {
- if ($_[4]) {
- if (@radd = _add_thingy($parent, $_[4])) {
- }
+ for (@ent) {
+ push @radd, _add_thingy($parent, $_);
}
} elsif ($sort eq 'D') {
- if ($_[4]) {
- if (@rdel = _del_thingy($parent, $_[4])) {
- }
+ for (@ent) {
+ push @rdel, _del_thingy($parent, $_);
}
} elsif ($sort eq 'C') {
- my $i;
my (@nodes, @users);
- for ($i = 4; $_[$i]; $i++) {
- my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_[$i]);
+ for (@ent) {
+ my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);
if ($call) {
if ($is_node) {
push @nodes, $call;
push @users, $call;
}
} else {
- dbg("DXPROT: pc92 call entry '$_[$i]' not decoded, ignored") if isdbg('chanerr');
+ dbg("DXPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr');
}
}
my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users);
- for ($i = 4; $_[$i]; $i++) {
- my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_[$i]);
+ for (@ent) {
+ my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);
if ($call) {
- push @radd,_add_thingy($parent, $_[$i]) if grep $call eq $_, (@$nnodes, @$nusers);
- push @rdel,_del_thingy($parent, $_[$i]) if grep $call eq $_, (@$dnodes, @$dusers);
+ push @radd,_add_thingy($parent, $_) if grep $call eq $_, (@$nnodes, @$nusers);
+ push @rdel,_del_thingy($parent, $_) if grep $call eq $_, (@$dnodes, @$dusers);
}
}
} else {
return;
}
- $self->broadcast_route_pc9x($origin, undef, $line, 0);
+ $self->broadcast_route_pc9x($pcall, undef, $line, 0);
foreach my $r (@rdel) {
+ next unless $r;
+
$self->route_pc21($pcall, undef, $r) if $r->isa('Route::Node');
$self->route_pc17($pcall, undef, $parent, $r) if $r->isa('Route::User');
}
foreach my $r (@radd) {
+ next unless $r;
+
$self->route_pc19($pcall, undef, $r) if $r->isa('Route::Node');
$self->route_pc16($pcall, undef, $parent, $r) if $r->isa('Route::User');
}
}
}
}
+
+1;
projects / spider.git / blobdiff