use Script;
use Investigate;
use RouteDB;
-
+use Thingy;
+use Thingy::Dx;
+use Thingy::Rt;
+use Thingy::Ping;
+use Thingy::T;
use strict;
use vars qw($VERSION $BRANCH);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /^\d+\.\d+(?:\.(\d+)\.(\d+))?$/ || (0,0));
$main::build += $VERSION;
$main::branch += $BRANCH;
$main::me->{metric} = 0;
$main::me->{pingave} = 0;
$main::me->{registered} = 1;
- $main::me->{version} = $main::version;
+ $main::me->{version} = 5251 + $main::version;
$main::me->{build} = $main::build;
}
$self->send(pc18());
}
-sub removepc90
-{
- $_[0] =~ s/^PC90\^[-A-Z0-9]+\^\d+\^//;
- $_[0] =~ s/^PC91\^[-A-Z0-9]+\^\d+\^[-A-Z0-9]+\^//;
-}
-
-#sub send
-#{
-# my $self = shift;
-# while (@_) {
-# my $line = shift;
-# $self->SUPER::send($line);
-# }
-#}
#
# This is the normal pcxx despatcher
{
my ($self, $line) = @_;
- # remove any incoming PC90 frames
- removepc90($line);
-
my @field = split /\^/, $line;
return unless @field;
# print join(',', @field), "\n";
-
# process PC frames, this will fail unless the frame starts PCnn
my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
unless (defined $pcno && $pcno >= 10 && $pcno <= 99) {
return;
}
+ # decrement any hop fields at this point
+ if ($line =~ /\^H(\d\d?)\^?~?$/) {
+ my $hops = $1 - 1;
+ if ($hops < 0) {
+ dbg("PCPROT: zero hop count, dumped") if isdbg('chanerr');
+ return;
+ }
+ $line =~ s/\^H\d\d?(\^?~?)$/^H$hops$1/;
+ }
+
my $origin = $self->{call};
no strict 'subs';
my $sub = "handle_$pcno";
}
# remember a route to this node and also the node on which this user is
- RouteDB::update($_[6], $self->{call});
+ RouteDB::update($_[6], $origin);
# RouteDB::update($to, $_[6]);
# it is here and logged on
}
# is it 'baddx'
- if ($baddx->in($_[2]) || BadWords::check($_[2]) || $_[2] =~ /COCK/) {
+ if ($baddx->in($_[2]) || BadWords::check($_[2])) {
dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
return;
}
# RouteDB::update($_[6], $_[7]);
my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $_[6], $_[7]);
- # global spot filtering on INPUT
- if ($self->{inspotsfilter}) {
- my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
- unless ($filter) {
- dbg("PCPROT: Rejected by input spot filter") if isdbg('chanerr');
- return;
- }
- }
+
+ my $thing = Thingy::Dx->new(origin=>$main::mycall);
+ $thing->from_DXProt(DXProt=>$line,spotdata=>\@spot);
+ $thing->queue($self);
# this goes after the input filtering, but before the add
# so that if it is input filtered, it isn't added to the dup
# list. This allows it to come in from a "legitimate" source
- if (Spot::dup($_[1], $_[2], $d, $_[5], $_[6])) {
- dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
- return;
- }
-
- # add it
- Spot::add(@spot);
-
#
# @spot at this point contains:-
# freq, spotted call, time, text, spotter, spotted cc, spotters cc, orig node
return if $pcno == 26;
# send out the filtered spots
- send_dx_spot($self, $line, @spot) if @spot;
+# send_dx_spot($self, $line, @spot) if @spot;
}
# announces
# dos I want users from this channel?
unless ($self->user->wantpc16) {
- dbg("PCPROT: don't send users to $self->{call}") if isdbg('chanerr');
+ dbg("PCPROT: don't send users to $origin") if isdbg('chanerr');
return;
}
# is it me?
return;
}
- RouteDB::update($ncall, $self->{call});
+
+ RouteDB::update($ncall, $origin);
# do we believe this call?
- unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
- if (my $ivp = Investigate::get($ncall, $self->{call})) {
+ unless ($ncall eq $origin || $self->is_believed($ncall)) {
+ if (my $ivp = Investigate::get($ncall, $origin)) {
$ivp->store_pcxx($pcno,$line,$origin,@_);
} else {
- dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
+ dbg("PCPROT: We don't believe $ncall on $origin") if isdbg('chanerr');
}
return;
}
# 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) {
- my $nl = $pc19list{$ncall};
-
- if ($nl && @_ > 3) { # 3 because of the hop count!
-
- # this is a new (remembered) node, now attach it to me if it isn't in filtered
- # and we haven't disallowed it
- my $user = DXUser->get_current($ncall);
- if (!$user) {
- $user = DXUser->new($ncall);
- $user->sort('A');
- $user->priv(1); # I have relented and defaulted nodes
- $user->lockout(1);
- $user->homenode($ncall);
- $user->node($ncall);
- }
+ if ($parent) {
- my $wantpc19 = $user->wantroutepc19;
- if ($wantpc19 || !defined $wantpc19) {
- my $new = Route->new($ncall); # throw away
- if ($self->in_filter_route($new)) {
- my @nrout;
- for (@$nl) {
- $parent = Route::Node::get($_->[0]);
- $dxchan = $parent->dxchan if $parent;
- if ($dxchan && $dxchan ne $self) {
- dbg("PCPROT: PC19 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
- $parent = undef;
- }
- if ($parent) {
- my $r = $parent->add($ncall, $_->[1], $_->[2]);
- push @nrout, $r unless @nrout;
- }
- }
- $user->wantroutepc19(1) unless defined $wantpc19; # for now we work on the basis that pc16 = real route
- $user->lastin($main::systime) unless DXChannel->get($ncall);
- $user->put;
-
- # route the pc19 - this will cause 'stuttering PC19s' for a while
- $self->route_pc19($origin, $line, @nrout) if @nrout ;
- $parent = Route::Node::get($ncall);
- unless ($parent) {
- dbg("PCPROT: lost $ncall after sending PC19 for it?");
- return;
- }
- } else {
- return;
- }
- delete $pc19list{$ncall};
- }
- } else {
- dbg("PCPROT: Node $ncall not in config") if isdbg('chanerr');
- return;
- }
- } else {
-
$dxchan = $parent->dxchan;
if ($dxchan && $dxchan ne $self) {
- dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+ dbg("PCPROT: PC16 from $origin trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
return;
}
- # input filter if required
- return unless $self->in_filter_route($parent);
- }
-
- my $i;
- my @rout;
- for ($i = 2; $i < $#_; $i++) {
- my ($call, $conf, $here) = $_[$i] =~ /^(\S+) (\S) (\d)/o;
- next unless $call && $conf && defined $here && is_callsign($call);
- next if $call eq $main::mycall;
-
- eph_del_regex("^PC17\\^$call\\^$ncall");
+
+ my $i;
+ my @rout;
+ for ($i = 2; $i < $#_; $i++) {
+ my ($call, $conf, $here) = $_[$i] =~ /^(\S+) (\S) (\d)/o;
+ next unless $call && $conf && defined $here && is_callsign($call);
+ next if $call eq $main::mycall;
+
+ eph_del_regex("^PC17\\^$call\\^$ncall");
- $conf = $conf eq '*';
-
- # reject this if we think it is a node already
- my $r = Route::Node::get($call);
- my $u = DXUser->get_current($call) unless $r;
- if ($r || ($u && $u->is_node)) {
- dbg("PCPROT: $call is a node") if isdbg('chanerr');
- next;
- }
+ $conf = 1;
- $r = Route::User::get($call);
- my $flags = Route::here($here)|Route::conf($conf);
+ my $r = Route::User::get($call);
+ my $flags = Route::here($here)|Route::conf($conf);
- if ($r) {
- my $au = $r->addparent($parent);
- if ($r->flags != $flags) {
- $r->flags($flags);
- $au = $r;
+ if ($r) {
+ my $au = $r->addparent($parent);
+ if ($r->flags != $flags) {
+ $r->flags($flags);
+ $au = $r;
+ }
+ push @rout, $r if $au;
+ } else {
+ push @rout, $parent->add_user($call, $flags);
}
- push @rout, $r if $au;
- } else {
- push @rout, $parent->add_user($call, $flags);
- }
- # add this station to the user database, if required
- $call =~ s/-\d+$//o; # remove ssid for users
- my $user = DXUser->get_current($call);
- $user = DXUser->new($call) if !$user;
- $user->homenode($parent->call) if !$user->homenode;
- $user->node($parent->call);
- $user->lastin($main::systime) unless DXChannel->get($call);
- $user->put;
+ # add this station to the user database, if required
+ $call =~ s/-\d+$//o; # remove ssid for users
+ my $user = DXUser->get_current($call);
+ $user = DXUser->new($call) if !$user;
+ $user->homenode($parent->call) if !$user->homenode;
+ $user->node($parent->call);
+ $user->lastin($main::systime) unless DXChannel->get($call);
+ $user->put;
+ }
+
+ if (@rout) {
+ my $thing = Thingy::Rt->new(origin=>$main::mycall);
+ $thing->from_DXProt(t=>'ea', n=>$ncall, u=>join(':',map {"$_->{flags}$_->{call}"} @rout), DXProt=>$line);
+ $thing->queue($self);
+ } else {
+ dbg("PCPROT: No usable users") if isdbg('chanerr');
+ }
}
- $self->route_pc16($origin, $line, $parent, @rout) if @rout;
}
# remove a user
# do I want users from this channel?
unless ($self->user->wantpc16) {
- dbg("PCPROT: don't send users to $self->{call}") if isdbg('chanerr');
+ dbg("PCPROT: don't send users to $origin") if isdbg('chanerr');
return;
}
if ($ncall eq $main::mycall) {
return;
}
- RouteDB::delete($ncall, $self->{call});
+ RouteDB::delete($ncall, $origin);
# do we believe this call?
- unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
- if (my $ivp = Investigate::get($ncall, $self->{call})) {
+ unless ($ncall eq $origin || $self->is_believed($ncall)) {
+ if (my $ivp = Investigate::get($ncall, $origin)) {
$ivp->store_pcxx($pcno,$line,$origin,@_);
} else {
- dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
+ dbg("PCPROT: We don't believe $ncall on $origin") if isdbg('chanerr');
}
return;
}
$dxchan = $parent->dxchan if $parent;
if ($dxchan && $dxchan ne $self) {
- dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+ dbg("PCPROT: PC17 from $origin trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
return;
}
- # input filter if required and then remove user if present
- if ($parent) {
-# 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);
+ my $thing = Thingy::Rt->new(origin=>$main::mycall);
+ $thing->from_DXProt(t=>'ed', n=>$ncall, u=>"1$ucall", DXProt=>$line);
+ $thing->queue($self);
}
# link request
# record the type and version offered
if ($_[1] =~ /DXSpider Version: (\d+\.\d+) Build: (\d+\.\d+)/) {
- $self->version(53 + $1);
- $self->user->version(53 + $1);
+ $self->version(52.51 + $1);
+ $self->user->version(52.51 + $1);
$self->build(0 + $2);
$self->user->build(0 + $2);
unless ($self->is_spider) {
}
# first clear out any nodes on this dxchannel
- my $parent = Route::Node::get($self->{call});
+ my $parent = Route::Node::get($origin);
my @rout = $parent->del_nodes;
$self->route_pc21($origin, $line, @rout, $parent) if @rout;
$self->send_local_config();
my @rout;
# first get the INTERFACE node
- my $parent = Route::Node::get($self->{call});
+ my $parent = Route::Node::get($origin);
unless ($parent) {
- dbg("DXPROT: my parent $self->{call} has disappeared");
+ dbg("DXPROT: my parent $origin has disappeared");
$self->disconnect;
return;
}
# check that this PC19 isn't trying to alter the wrong dxchan
my $dxchan = DXChannel->get($call);
if ($dxchan && $dxchan != $self) {
- dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr');
+ dbg("PCPROT: PC19 from $origin trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr');
next;
}
}
$user->sort('A') unless $user->is_node;
- RouteDB::update($call, $self->{call});
+ RouteDB::update($call, $origin);
# do we believe this call?
my $genline = "PC19^$here^$call^$conf^$ver^$_[-1]^";
- unless ($call eq $self->{call} || $self->is_believed($call)) {
- my $pt = $user->lastping($self->{call}) || 0;
- if ($pt+$investigation_int < $main::systime && !Investigate::get($call, $self->{call})) {
- my $ivp = Investigate->new($call, $self->{call});
+ 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 $self->{call}") if isdbg('chanerr');
+ dbg("PCPROT: We don't believe $call on $origin") if isdbg('chanerr');
}
$user->put;
next;
} else {
# if he is directly connected or allowed then add him, otherwise store him up for later
- if ($call eq $self->{call} || $user->wantroutepc19) {
+ if ($call eq $origin || $user->wantroutepc19) {
my $new = Route->new($call); # throw away
if ($self->in_filter_route($new)) {
my $ar = $parent->add($call, $ver, $flags);
} else {
$pc19list{$call} = [] unless exists $pc19list{$call};
my $nl = $pc19list{$call};
- push @{$pc19list{$call}}, [$self->{call}, $ver, $flags] unless grep $_->[0] eq $self->{call}, @$nl;
+ push @{$pc19list{$call}}, [$origin, $ver, $flags] unless grep $_->[0] eq $origin, @$nl;
}
}
return;
}
- RouteDB::delete($call, $self->{call});
+ RouteDB::delete($call, $origin);
# check if we believe this
- unless ($call eq $self->{call} || $self->is_believed($call)) {
- if (my $ivp = Investigate::get($call, $self->{call})) {
+ unless ($call eq $origin || $self->is_believed($call)) {
+ if (my $ivp = Investigate::get($call, $origin)) {
$ivp->store_pcxx($pcno,$line,$origin,@_);
} else {
- dbg("PCPROT: We don't believe $call on $self->{call}") if isdbg('chanerr');
+ dbg("PCPROT: We don't believe $call on $origin") if isdbg('chanerr');
}
return;
}
# this routing table manipulation, just remove it from the list and dump it
my @rout;
if (my $nl = $pc19list{$call}) {
- $pc19list{$call} = [ grep {$_->[0] ne $self->{call}} @$nl ];
+ $pc19list{$call} = [ grep {$_->[0] ne $origin} @$nl ];
delete $pc19list{$call} unless @{$pc19list{$call}};
} else {
- my $parent = Route::Node::get($self->{call});
+ my $parent = Route::Node::get($origin);
unless ($parent) {
- dbg("DXPROT: my parent $self->{call} has disappeared");
+ dbg("DXPROT: my parent $origin has disappeared");
$self->disconnect;
return;
}
my $dxchan = DXChannel->get($call);
if ($dxchan && $dxchan != $self) {
- dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr');
+ dbg("PCPROT: PC21 from $origin trying to alter locally connected $call, ignored!") if isdbg('chanerr');
return;
}
my $pcno = shift;
my $line = shift;
my $origin = shift;
- if ($_[1] eq $self->{call}) {
+ if ($_[1] eq $origin) {
$self->disconnect(1);
} else {
dbg("PCPROT: came in on wrong channel") if isdbg('chanerr');
my $call = $_[1];
- RouteDB::update($call, $self->{call});
+ RouteDB::update($call, $origin);
my $node = Route::Node::get($call);
if ($node) {
- return unless $node->call eq $self->{call};
+ return unless $node->call eq $origin;
$node->usercount($_[2]);
# input filter if required
$tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
}
$tochan->{nopings} = $nopings; # pump up the timer
- if (my $ivp = Investigate::get($from, $self->{call})) {
+ if (my $ivp = Investigate::get($from, $origin)) {
$ivp->handle_ping;
}
} elsif (my $rref = Route::Node::get($r->{call})) {
- if (my $ivp = Investigate::get($from, $self->{call})) {
+ if (my $ivp = Investigate::get($from, $origin)) {
$ivp->handle_ping;
}
}
}
} else {
- RouteDB::update($from, $self->{call});
+ RouteDB::update($from, $origin);
if (eph_dup($line)) {
dbg("PCPROT: dup PC51 detected") if isdbg('chanerr');
#
-sub send_dx_spot
-{
- my $self = shift;
- my $line = shift;
- my @dxchan = DXChannel->get_all();
- my $dxchan;
-
- # send it if it isn't the except list and isn't isolated and still has a hop count
- # taking into account filtering and so on
- foreach $dxchan (@dxchan) {
- next if $dxchan == $main::me;
- next if $dxchan == $self && $self->is_node;
- $dxchan->dx_spot($line, $self->{isolate}, @_, $self->{call});
- }
-}
-
-sub dx_spot
-{
- my $self = shift;
- my $line = shift;
- my $isolate = shift;
- my ($filter, $hops);
-
- if ($self->{spotsfilter}) {
- ($filter, $hops) = $self->{spotsfilter}->it(@_);
- return unless $filter;
- }
- send_prot_line($self, $filter, $hops, $isolate, $line);
-}
-
sub send_prot_line
{
my ($self, $filter, $hops, $isolate, $line) = @_;
$s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops;
} else {
# simply decrement it
- $hops--;
+# $hops--; this is done on receipt now
return "" if !$hops;
$s =~ s/\^H(\d+)(\^~?)$/\^H$hops$2/ if $hops;
}
projects / spider.git / blobdiff