use RouteDB;
use Thingy;
use Thingy::Dx;
+use Thingy::Rt;
+use Thingy::Ping;
+use Thingy::T;
+use Thingy::Hello;
+use Thingy::Bye;
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));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
$last_hour $last10 %eph %pings %rcmds $ann_to_talk
my $pkg = shift;
my $call = shift;
$main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
-
+ my $thing = Thingy::Hello->new(user=>$call);
+ $thing->broadcast($self);
+
return $self;
}
}
# 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;
}
my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $_[6], $_[7]);
- my $thing = Thingy::Dx->new(origin=>$main::mycall, group=>'DX');
+ my $thing = Thingy::Dx->new(origin=>$main::mycall);
$thing->from_DXProt(DXProt=>$line,spotdata=>\@spot);
- $thing->queue($self);
+ $thing->process($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
}
}
}
-
- # local processing
- my $r;
- eval {
- $r = Local::spot($self, @spot);
- };
- # dbg("Local::spot1 error $@") if isdbg('local') if $@;
- return if $r;
-
- # DON'T be silly and send on PC26s!
- return if $pcno == 26;
-
- # send out the filtered spots
-# send_dx_spot($self, $line, @spot) if @spot;
}
# announces
return;
}
+
RouteDB::update($ncall, $origin);
# do we believe this call?
# 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 $origin 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 $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;
+ my $flags = $here ? 1 : 0;
+ $rout .= "$flags$call:";
}
-
- $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;
- }
- push @rout, $r if $au;
+
+
+ if ($rout) {
+ chop $rout;
+ my $thing = Thingy::Rt->new(origin=>$main::mycall, user=>$self->{call});
+ $thing->from_DXProt(t=>'au', $ncall eq $self->{call} ? () : ('n', "1$ncall"), u=>$rout, DXProt=>$line);
+ $thing->process($self);
} else {
- push @rout, $parent->add_user($call, $flags);
+ dbg("PCPROT: No usable users") if isdbg('chanerr');
}
-
-
- # 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;
+ } else {
+ dbg("PCPROT: no PC19 seen for $ncall" ) if isdbg('chanerr');
}
- $self->route_pc16($origin, $line, $parent, @rout) if @rout;
}
# remove a user
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, user=>$self->{call});
+ $thing->from_DXProt(t=>'du', $ncall eq $self->{call} ? () : ('n', "1$ncall"), u=>"1$ucall", DXProt=>$line);
+ $thing->process($self);
}
# link request
#
-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) = @_;
# broadcast to all other nodes that all the nodes connected to via me are gone
unless ($pc39flag && $pc39flag == 2) {
+ my $thing = Thingy::Bye->new(user=>$call);
+ $thing->broadcast($self);
+
$self->route_pc21($main::mycall, undef, @rout) if @rout;
}
projects / spider.git / blobdiff