}
}
+# my ($hops) = $_[8] =~ /^H(\d+)/;
+
# is the spotted callsign blank? This should really be trapped earlier but it
# could break other protocol sentences. Also check for lower case characters.
if ($_[2] =~ /^\s*$/) {
$self->sort('S');
}
# $self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/;
- if ($_[1] =~ /\bpc9x/) {
- if ($self->{isolate}) {
- dbg("pc9x recognised, but $self->{call} is isolated, using old protocol");
- } elsif (!$self->user->wantpc9x) {
- dbg("pc9x explicitly switched off on $self->{call}, using old protocol");
- } else {
- $self->{do_pc9x} = 1;
- dbg("Do px9x set on $self->{call}");
- }
- }
} else {
dbg("Unknown software");
$self->version(50.0);
$self->user->version($self->version);
}
+ if ($_[1] =~ /\bpc9x/) {
+ if ($self->{isolate}) {
+ dbg("pc9x recognised, but $self->{call} is isolated, using old protocol");
+ } elsif (!$self->user->wantpc9x) {
+ dbg("pc9x explicitly switched off on $self->{call}, using old protocol");
+ } else {
+ $self->{do_pc9x} = 1;
+ dbg("Do px9x set on $self->{call}");
+ }
+ }
+
# first clear out any nodes on this dxchannel
my @rout = $parent->del_nodes;
$self->route_pc21($origin, $line, @rout, $parent) if @rout;
my $line = shift;
my $origin = shift;
+ return if (eph_dup($line));
+
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]);
+ $node->usercount($_[2]) unless $node->users;
+ $node->reset_obs;
# input filter if required
- return unless $self->in_filter_route($node);
+# return unless $self->in_filter_route($node);
- $self->route_pc50($origin, $line, $node, $_[2], $_[3]) unless eph_dup($line);
+ unless ($self->{isolate}) {
+ DXChannel::broadcast_nodes($line, $self); # send it to everyone but me
+ }
+# $self->route_pc50($origin, $line, $node, $_[2], $_[3]) unless eph_dup($line);
}
}
my $icall = shift;
my @part = split /:/, $icall;
my ($flag, $call) = unpack "A A*", $part[0];
- return () unless defined $flag && $flag ge '0' && $flag le '7';
- return () unless $call && is_callsign($call);
+ unless (defined $flag && $flag ge '0' && $flag le '7') {
+ dbg("PCPROT: $icall no flag byte (0-7) at front of call, ignored") if isdbg('chanerr');
+ return ();
+ }
+ unless ($call && is_callsign($call)) {
+ dbg("PCPROT: $icall no recognisable callsign, ignored") if isdbg('chanerr');
+ return ();
+ }
my $is_node = $flag & 4;
my $is_extnode = $flag & 2;
my $here = $flag & 1;
my $_last_time;
my $_last_occurs;
+my $_last_pc9x_id;
+
+sub last_pc9x_id
+{
+ return $_last_pc9x_id;
+}
sub gen_pc9x_t
{
if (!$_last_time || $_last_time != $main::systime) {
$_last_time = $main::systime;
$_last_occurs = 0;
- return $_last_time - $main::systime_daystart;
+ return $_last_pc9x_id = $_last_time - $main::systime_daystart;
} else {
$_last_occurs++;
- return sprintf "%d.%02d", $_last_time - $main::systime_daystart, $_last_occurs;
+ return $_last_pc9x_id = sprintf "%d.%02d", $_last_time - $main::systime_daystart, $_last_occurs;
}
}
return $parent;
}
+sub pc92_handle_first_slot
+{
+ my $self = shift;
+ my $slot = shift;
+ my $parent = shift;
+ my $t = shift;
+ my $oparent = $parent;
+
+ my @radd;
+
+ my ($call, $is_node, $is_extnode, $here, $version, $build) = @$slot;
+ if ($call && $is_node) {
+ if ($call eq $main::mycall) {
+ dbg("PCPROT: $call looped back onto $main::mycall, ignored") if isdbg('chanerr');
+ return;
+ }
+ # this is only accepted from my "self".
+ # this also kills configs from PC92 nodes with external PC19 nodes that are also
+ # locally connected. Local nodes always take precedence. But we remember the lastid
+ # to try to reduce the number of dupe PC92s for this external node.
+ if (DXChannel::get($call) && $call ne $self->{call}) {
+ $parent = check_pc9x_t($call, $t, 92); # this will update the lastid time
+ dbg("PCPROT: locally connected node $call from other another node $self->{call}, ignored") if isdbg('chanerr');
+ return;
+ }
+ 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)) {
+ if ($is_extnode && $oparent) {
+ @radd = _add_thingy($oparent, $slot);
+ $parent = $radd[0];
+ } else {
+ dbg("PCPROT: no previous C or A for this external node received, ignored") if isdbg('chanerr');
+ return;
+ }
+ }
+ $parent = check_pc9x_t($call, $t, 92) || return;
+ $parent->via_pc92(1);
+ $parent->PC92C_dxchan($self->{call});
+ }
+ } else {
+ dbg("PCPROT: must be \$mycall or external node as first entry, ignored") if isdbg('chanerr');
+ return;
+ }
+ $parent->here(Route::here($here));
+ $parent->version($version || $pc19_version) if $version;
+ $parent->build($build) if $build && $build > $parent->build;
+ $parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
+ return ($parent, @radd);
+}
+
# DXSpider routing entries
sub handle_92
{
my (@radd, @rdel);
my $pcall = $_[1];
- unless ($pcall) {
- dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr');
- return;
- }
my $t = $_[2];
my $sort = $_[3];
}
return;
}
+
+ } elsif ($sort eq 'K') {
+ # remember the last channel we arrived on
+ $parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
+
+ my @ent = _decode_pc92_call($_[4]);
+
+ if (@ent) {
+ my $add;
+
+ ($parent, $add) = $self->pc92_handle_first_slot($ent[0], $parent, $t);
+ return unless $parent; # dupe
+
+ push @radd, $add if $add;
+ dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
+ }
} elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {
# remember the last channel we arrived on
# cope with missing duplicate node calls in the first slot for A or D
my $me = $_[4] || '';
- $me ||= _encode_pc92_call($parent) if !$me && ($sort eq 'A' || $sort eq 'D');
+ if (($sort eq 'A' || $sort eq 'D')) {
+ $me ||= _encode_pc92_call($parent) if !$me ;
+ } else {
+ unless ($me) {
+ dbg("PCPROT: this type of PC92 *must* have a node call in the first slot, ignored") if is_dbg('chanerr');
+ return;
+ }
+ }
my @ent = map {[ _decode_pc92_call($_) ]} grep {$_ && /^[0-7]/} $me, @_[5 .. $#_];
# except in the case of 'A' or 'D' in which the $pcall is used
# otherwise use the node call and update any information
# that needs to be done.
- my ($call, $is_node, $is_extnode, $here, $version, $build) = @{$ent[0]};
- if (($sort eq 'A' || $sort eq 'D') && !$is_node) {
- # parent is already set correctly
- # this is to allow shortcuts for A and D records
- # not repeating the origin call to no real purpose
- ;
- } else {
- if ($call && $is_node) {
- if ($call eq $main::mycall) {
- dbg("PCPROT: $call looped back onto $main::mycall, ignored") if isdbg('chanerr');
- return;
- }
- # this is only accepted from my "self".
- # this also kills configs from PC92 nodes with external PC19 nodes that are also
- # locally connected. Local nodes always take precedence.
- if (DXChannel::get($call) && $call ne $self->{call}) {
- dbg("PCPROT: locally connected node $call from other another node $self->{call}, ignored") if isdbg('chanerr');
- return;
- }
- 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)) {
- if ($is_extnode && $oparent) {
- @radd = _add_thingy($oparent, $ent[0]);
- $parent = $radd[0];
- } else {
- dbg("PCPROT: no previous C or A for this external node received, ignored") if isdbg('chanerr');
- return;
- }
- }
- $parent = check_pc9x_t($call, $t, 92) || return;
- $parent->via_pc92(1);
- $parent->PC92C_dxchan($self->{call});
- }
- } else {
- dbg("PCPROT: must be mycall or external node as first entry, ignored") if isdbg('chanerr');
- return;
- }
- $parent->here(Route::here($here));
- $parent->version($version) if $version && $version > $parent->version;
- $parent->build($build) if $build && $build > $parent->build;
- $parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
- shift @ent;
- }
+ my $add;
+
+ ($parent, $add) = $self->pc92_handle_first_slot($ent[0], $parent, $t);
+ return unless $parent; # dupe
+
+ shift @ent;
+ push @radd, $add if $add;
}
# do a pass through removing any references to either locally connected nodes or mycall
} elsif ($sort eq 'C') {
my (@nodes, @users);
- # we only reset obscounts on config records
- $oparent->reset_obs;
- dbg("ROUTE: reset obscount on $pcall now " . $oparent->obscount) if isdbg('obscount');
- if ($oparent != $parent) {
- $parent->reset_obs;
- dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
- }
+ # we reset obscounts on config records as well as K records
+ dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
#
foreach my $r (@nent) {
# $self->{do_pc9x} ||= 1;
- my $pcall = $_[1];
- unless (is_callsign($pcall)) {
- dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr');
- return;
- }
+ my $pcall = $_[1]; # this is now checked earlier
# remember that we are converting PC10->PC93 and self will be $main::me if it
# comes from us