$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
$self->send(pc20());
}
+sub check_add_node
+{
+ my $call = shift;
+
+ # add this station to the user database, if required (don't remove SSID from nodes)
+ my $user = DXUser->get_current($call);
+ if (!$user) {
+ $user = DXUser->new($call);
+ $user->priv(1); # I have relented and defaulted nodes
+ $user->lockout(1);
+ $user->homenode($call);
+ $user->node($call);
+ }
+ $user->sort('A') unless $user->is_node;
+ return $user;
+}
+
# incoming cluster list
sub handle_19
{
next;
}
- # add this station to the user database, if required (don't remove SSID from nodes)
- my $user = DXUser->get_current($call);
- if (!$user) {
- $user = DXUser->new($call);
- $user->priv(1); # I have relented and defaulted nodes
- $user->lockout(1);
- $user->homenode($call);
- $user->node($call);
- }
- $user->sort('A') unless $user->is_node;
-
+ my $user = check_add_node($call);
+
# if (eph_dup($genline)) {
# dbg("PCPROT: dup PC19 for $call detected") if isdbg('chanerr');
# next;
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, $parent, @rout);
}
}
if (@rout) {
$self->route_pc21($origin, $line, @rout);
- $self->route_pc92d($main::mycall, $line, @rout);
+ $self->route_pc92d($main::mycall, $line, $parent, @rout);
}
}
my $call = $ref->call;
my $extra = '';
$flag |= $ref->here ? 1 : 0;
- if ($ext && ($ref->isa('Route::Node') || $ref->isa('DXProt'))) {
+ if ($ref->isa('Route::Node') || $ref->isa('DXProt')) {
$flag |= 4;
-# if ($ref->version || $ref->build) {
- if ($ref->version) {
- my $version = $ref->version || 1.0;
- $version = $version * 100 + 5300 if $version < 50;
- $extra .= ":" . $version;
-# $extra .= (":" . ($ref->build ? $ref->build : '')) if $ref->build;
+ 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;
+ $version = $version * 100 + 5300 if $version < 50;
+ $extra .= ":" . $version;
+ }
}
}
return "$flag$call$extra";
}
+sub _add_thingy
+{
+ my $parent = shift;
+ my $s = shift;
+ my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($s);
+ my @rout;
+
+ if ($call) {
+ if ($is_node) {
+ @rout = $parent->add($call, $version, Route::here($here));
+ } else {
+ @rout = $parent->add_user($call, Route::here($here));
+ }
+ }
+ return @rout;
+}
+
+sub _del_thingy
+{
+ my $parent = shift;
+ my $s = shift;
+ my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($s);
+ my @rout;
+ if ($call) {
+ if ($is_node) {
+ my $nref = Route::Node::get($call);
+ @rout = $nref->del($parent) if $nref;
+ } else {
+ my $uref = Route::User::get($call);
+ @rout = $parent->del_user($uref) if $uref;
+ }
+ }
+ return @rout;
+}
+
# DXSpider routing entries
sub handle_92
{
$self->{do_pc92} ||= 1;
- my ($ncall, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_[1]);
- unless ($ncall) {
+ my $pcall = $_[1];
+ unless ($pcall) {
dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr');
return;
}
my $t = $_[2];
my $sort = $_[3];
- if ($ncall eq $main::mycall) {
+ my @ent = grep {$_ && /^[0-7]/} @_[4 .. -1];
+
+ if ($pcall eq $main::mycall) {
dbg("PCPROT: looped back, ignored") if isdbg('chanerr');
return;
}
- my $nref = Route::Node::get($ncall);
- if ($nref) {
- my $lastid = $nref->lastid->{92} || 0;
+ 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');
return;
}
- $nref->flags(Route::flags($here));
} else {
- $nref = Route::Node->new($ncall, $version, Route::here($here));
+ $parent = Route::Node->new($pcall);
+ }
+ $parent->lastid->{92} = $t;
+
+ if (@ent) {
+ my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($ent[0]);
+ if ($call && $is_node && $call eq $main::mycall) {
+ $parent->here(Route::here($here));
+ $parent->version($version) if $version;
+ $parent->build($build) if $build;
+ } elsif ($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;
+ }
+ } else {
+ dbg("PCPROT: must be mycall or external node as first entry, ignored") if isdbg('chanerr');
+ return;
+ }
+ shift @ent;
}
- $nref->lastid->{92} = $t;
+ my (@radd, @rdel);
+
if ($sort eq 'A') {
-
+ for (@ent) {
+ push @radd, add_thingy($parent, $_);
+ }
} elsif ($sort eq 'D') {
-
+ for (@ent) {
+ push @rdel, _del_thingy($parent, $_);
+ }
} elsif ($sort eq 'C') {
+ my $i;
+ my (@nodes, @users);
+ for (@ent) {
+ my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);
+ if ($call) {
+ if ($is_node) {
+ push @nodes, $call;
+ } else {
+ push @users, $call;
+ }
+ } else {
+ dbg("DXPROT: pc92 call entry '$_[$i]' not decoded, ignored") if isdbg('chanerr');
+ }
+ }
+
+ my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users);
+ 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);
+ }
+ }
} else {
dbg("PCPROT: unknown action '$sort', ignored") if isdbg('chanerr');
+ return;
+ }
+
+ $self->broadcast_route_pc9x($origin, undef, $line, 0);
+ foreach my $r (@rdel) {
+ $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) {
+ $self->route_pc19($pcall, undef, $r) if $r->isa('Route::Node');
+ $self->route_pc16($pcall, undef, $parent, $r) if $r->isa('Route::User');
}
}
projects / spider.git / blobdiff