# check for and dump bad protocol messages
my $n = check($pcno, @field);
if ($n) {
- dbg('chan', "PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")");
+ dbg("PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")") if isdbg('chanerr');
return;
}
eval {
$pcr = Local::pcprot($self, $pcno, @field);
};
-# dbg('local', "Local::pcprot error $@") if $@;
+# dbg("Local::pcprot error $@") if isdbg('local') if $@;
return if $pcr;
SWITCH: {
if ($censorpc) {
my @bad;
if (@bad = BadWords::check($field[3])) {
- dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+ dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
return;
}
}
# if this is a 'nodx' node then ignore it
if ($badnode->in($field[7])) {
- dbg('chan', "PCPROT: Bad Node, dropped");
+ dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
return;
}
# if this is a 'bad spotter' user then ignore it
if ($badspotter->in($field[6])) {
- dbg('chan', "PCPROT: Bad Spotter, dropped");
+ dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
return;
}
my $d = cltounix($field[3], $field[4]);
# bang out (and don't pass on) if date is invalid or the spot is too old (or too young)
if (!$d || ($pcno == 11 && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
- dbg('chan', "PCPROT: Spot ignored, invalid date or out of range ($field[3] $field[4])\n");
+ dbg("PCPROT: Spot ignored, invalid date or out of range ($field[3] $field[4])\n") if isdbg('chanerr');
return;
}
# is it 'baddx'
if ($baddx->in($field[2])) {
- dbg('chan', "PCPROT: Bad DX spot, ignored");
+ dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
return;
}
$field[5] =~ s/^\s+//; # take any leading blanks off
$field[2] = unpad($field[2]); # take off leading and trailing blanks from spotted callsign
if ($field[2] =~ /BUST\w*$/) {
- dbg('chan', "PCPROT: useless 'BUSTED' spot");
+ dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chanerr');
return;
}
if (Spot::dup($field[1], $field[2], $d, $field[5])) {
- dbg('chan', "PCPROT: Duplicate Spot ignored\n");
+ dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
return;
}
if ($censorpc) {
my @bad;
if (@bad = BadWords::check($field[5])) {
- dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+ dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
return;
}
}
if ($self->{inspotsfilter}) {
my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
unless ($filter) {
- dbg('chan', "PCPROT: Rejected by filter");
+ dbg("PCPROT: Rejected by input spot filter") if isdbg('chanerr');
return;
}
}
eval {
$r = Local::spot($self, @spot);
};
-# dbg('local', "Local::spot1 error $@") if $@;
+# dbg("Local::spot1 error $@") if isdbg('local') if $@;
return if $r;
# DON'T be silly and send on PC26s!
# announce duplicate checking
$field[3] =~ s/^\s+//; # remove leading blanks
if (AnnTalk::dup($field[1], $field[2], $field[3])) {
- dbg('chan', "PCPROT: Duplicate Announce ignored");
+ dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
return;
}
if ($censorpc) {
my @bad;
if (@bad = BadWords::check($field[3])) {
- dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+ dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
return;
}
}
my ($filter, $hops) = $self->{inannfilter}->it(@field[1..6], $self->{call},
$ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
unless ($filter) {
- dbg('chan', "PCPROT: Rejected by filter");
+ dbg("PCPROT: Rejected by input announce filter") if isdbg('chanerr');
return;
}
}
my $newline = "PC16^";
if ($ncall eq $main::mycall) {
- dbg('chan', "PCPROT: trying to alter config on this node from outside!");
+ dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr');
return;
}
$dxchan = DXChannel->get($ncall);
if ($dxchan && $dxchan ne $self) {
- dbg('chan', "PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!");
+ dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
return;
}
my $parent = Route::Node::get($ncall);
unless ($parent) {
- dbg('chan', "PCPROT: Node $ncall not in config");
+ dbg("PCPROT: Node $ncall not in config") if isdbg('chanerr');
return;
}
+
+ # input filter if required
+ return unless $self->in_filter_route($parent);
+
my $i;
my @rout;
for ($i = 2; $i < $#field; $i++) {
my $flags = Route::here($here)|Route::conf($conf);
if ($r && $r->flags != $flags) {
- $r->$flags($flags);
+ $r->flags($flags);
push @rout, $r;
} elsif (!$r) {
push @rout, $parent->add_user($call, $flags);
my $ncall = $field[2];
my $ucall = $field[1];
if ($ncall eq $main::mycall) {
- dbg('chan', "PCPROT: trying to alter config on this node from outside!");
+ dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr');
return;
}
$dxchan = DXChannel->get($ncall);
if ($dxchan && $dxchan ne $self) {
- dbg('chan', "PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!");
+ dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
return;
}
my $parent = Route::Node::get($ncall);
unless ($parent) {
- dbg('chan', "PCPROT: Route::Node $ncall not in config");
+ dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chanerr');
return;
}
- my $r = Route::User::get($ucall);
- my @rout = $parent->del_user($ucall) if $r;
+
+ # input filter if required
+ return unless $self->in_filter_route($parent);
+
+ my @rout = $parent->del_user($ucall);
$self->route_pc17($parent, @rout) if @rout;
return;
}
# first clear out any nodes on this dxchannel
my $parent = Route::Node::get($self->{call});
- my @rout;
- for ($parent->nodes) {
- my $r = Route::Node::get($_);
- push @rout, $r->del_node if $r;
- }
+ my @rout = $parent->del_nodes;
$self->route_pc21(@rout, $parent);
$self->send_local_config();
$self->send(pc20());
next if length $call < 3; # min 3 letter callsigns
# update it if required
- my $r;
+ my $r = Route::Node::get($call);
my $flags = Route::here($here)|Route::conf($conf);
- if ($parent->call eq $call && ($parent->version ne $ver || $parent->flags != $flags)) {
- $parent->version($ver);
- $parent->flags($flags);
- push @rout, $parent;
- } elsif ($parent->call ne $call) {
- next if $call eq $main::mycall || $call eq $self->{call};
-
- my $r = $parent->add($call, $ver, Route::here($here)|Route::conf($conf));
- push @rout, $r if $r;
- } else {
- $r = Route::Node::get($call);
- if ($r && ($r->version ne $ver || $r->flags != $flags)) {
+ if ($r) {
+ my $ar;
+ if ($call ne $parent->call) {
+ $ar = $parent->add($r);
+ push @rout, $ar if $ar;
+ }
+ if ($r->version ne $ver || $r->flags != $flags) {
$r->version($ver);
$r->flags(Route::here($here)|Route::conf($conf));
- push @rout, $r;
+ push @rout, $r unless $ar;
+ }
+ } else {
+ next if $call eq $main::mycall || $call eq $self->{call};
+
+ my $new = $parent->new($call, $ver, Route::here($here)|Route::conf($conf));
+ if ($self->in_filter_route($new)) {
+ $parent->add($new);
+ push @rout, $new;
+ } else {
+ $new->del($parent);
}
}
my $call = uc $field[1];
my @rout;
my $parent = Route::Node::get($self->{call});
-
+ unless ($parent) {
+ dbg("PCPROT: Route::Node $call not in config") if isdbg('chanerr');
+ return;
+ }
+ my $node = Route::Node::get($call);
if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
if ($call eq $self->{call}) {
- dbg('chan', "PCPROT: Trying to disconnect myself with PC21");
+ dbg("PCPROT: Trying to disconnect myself with PC21") if isdbg('chanerr');
return;
}
- # routing objects
- if ($parent) {
- push @rout, $parent->del_node($call);
- } else {
- dbg('chan', "PCPROT: Route::Node $call not in config");
+ if ($node) {
+ # input filter it
+ return unless $self->in_filter_route($node);
+
+ # routing objects
+ push @rout, $node->del($parent);
}
} else {
- dbg('chan', "PCPROT: I WILL _NOT_ be disconnected!");
+ dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr');
return;
}
$self->route_pc21(@rout) if @rout;
my ($r) = $field[6] =~ /R=(\d+)/;
$r = 0 unless $r;
if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
- dbg('chan', "PCPROT: WWV Date ($field[1] $field[2]) out of range");
+ dbg("PCPROT: WWV Date ($field[1] $field[2]) out of range") if isdbg('chanerr');
return;
}
if (Geomag::dup($d,$sfi,$k,$i,$field[6])) {
- dbg('chan', "PCPROT: Dup WWV Spot ignored\n");
+ dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chanerr');
return;
}
$field[7] =~ s/-\d+$//o; # remove spotter's ssid
eval {
$rep = Local::wwv($self, $field[1], $field[2], $sfi, $k, $i, @field[6..8], $r);
};
-# dbg('local', "Local::wwv2 error $@") if $@;
+# dbg("Local::wwv2 error $@") if isdbg('local') if $@;
return if $rep;
# DON'T be silly and send on PC27s!
$ref->here($field[2]) if $ref;
$ref = Route::User::get($call);
$ref->here($field[2]) if $ref;
- last SWITCH;
+
+ # input filter if required
+ return unless $self->in_filter_route($ref);
+
+ $self->route_pc24($ref, $field[3]) if $ref && !eph_dup($line);
+ return;
}
if ($pcno == 25) { # merge request
return;
}
if ($field[2] eq $main::mycall) {
- dbg('chan', "PCPROT: Trying to merge to myself, ignored");
+ dbg("PCPROT: Trying to merge to myself, ignored") if isdbg('chanerr');
return;
}
if ($field[1] eq $self->{call}) {
$self->disconnect(1);
} else {
- dbg('chan', "PCPROT: came in on wrong channel");
+ dbg("PCPROT: came in on wrong channel") if isdbg('chanerr');
}
return;
}
if ($pcno == 41) { # user info
# add this station to the user database, if required
- my $user = DXUser->get_current($field[1]);
- $user = DXUser->new($field[1]) if !$user;
+ my $call = $field[1];
+ my $user = DXUser->get_current($call);
+ $user = DXUser->new($call) if !$user;
if ($field[2] == 1) {
$user->name($field[3]);
}
$user->lastoper($main::systime); # to cut down on excessive for/opers being generated
$user->put;
- last SWITCH;
+ my $ref = Route::get($call);
+
+ # input filter if required
+ return unless $self->in_filter_route($ref);
+
+ $self->route_pc41($ref, $call, $field[2], $field[3], $field[4]) if $ref && !eph_dup($line);
+ return;
}
+
if ($pcno == 43) {
last SWITCH;
}
+
if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47 || $pcno == 48) {
DXDb::process($self, $line);
return;
}
if ($pcno == 50) { # keep alive/user list
- my $node = Route::Node::get($field[1]);
+ my $call = $field[1];
+ my $node = Route::Node::get($call);
if ($node) {
return unless $node->call eq $self->{call};
$node->usercount($field[2]);
+
+ # input filter if required
+ return unless $self->in_filter_route($node);
+
+ $self->route_pc50($node, $field[2], $field[3]) unless eph_dup($line);
}
- last SWITCH;
+ return;
}
if ($pcno == 51) { # incoming ping requests/answers
+ my $to = $field[1];
+ my $from = $field[2];
+ my $flag = $field[3];
# is it for us?
- if ($field[1] eq $main::mycall) {
- my $flag = $field[3];
+ if ($to eq $main::mycall) {
if ($flag == 1) {
- $self->send(pc51($field[2], $field[1], '0'));
+ $self->send(pc51($from, $to, '0'));
} else {
# it's a reply, look in the ping list for this one
- my $ref = $pings{$field[2]};
+ my $ref = $pings{$from};
if ($ref) {
- my $tochan = DXChannel->get($field[2]);
+ my $tochan = DXChannel->get($from);
while (@$ref) {
my $r = shift @$ref;
my $dxchan = DXChannel->get($r->{call});
if ($dxchan->is_user) {
my $s = sprintf "%.2f", $t;
my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
- $dxchan->send($dxchan->msg('pingi', $field[2], $s, $ave))
+ $dxchan->send($dxchan->msg('pingi', $from, $s, $ave))
} elsif ($dxchan->is_node) {
if ($tochan) {
$tochan->{nopings} = $tochan->user->nopings || 2; # pump up the timer
}
} else {
# route down an appropriate thingy
- $self->route($field[1], $line);
+ $self->route($to, $line);
}
return;
}
if ($pcno == 75) { # dunno but route it
- if ($field[1] ne $main::mycall) {
- $self->route($field[1], $line);
+ my $call = $field[1];
+ if ($call ne $main::mycall) {
+ $self->route($call, $line);
}
return;
}
if ($pcno == 73) { # WCY broadcasts
+ my $call = $field[1];
# do some de-duping
- my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
+ my $d = cltounix($call, sprintf("%02d18Z", $field[2]));
if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
- dbg('chan', "PCPROT: WCY Date ($field[1] $field[2]) out of range");
+ dbg("PCPROT: WCY Date ($call $field[2]) out of range") if isdbg('chanerr');
return;
}
@field = map { unpad($_) } @field;
if (WCY::dup($d,@field[3..7])) {
- dbg('chan', "PCPROT: Dup WCY Spot ignored\n");
+ dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chanerr');
return;
}
eval {
$rep = Local::wwv($self, @field[1..12]);
};
- # dbg('local', "Local::wcy error $@") if $@;
+ # dbg("Local::wcy error $@") if isdbg('local') if $@;
return if $rep;
# broadcast to the eager world
}
if ($pcno == 84) { # remote commands (incoming)
- if ($field[1] eq $main::mycall) {
+ my $call = $field[1];
+ if ($call eq $main::mycall) {
my $ref = DXUser->get_current($field[2]);
my $cref = Route::Node::get($field[2]);
Log('rcmd', 'in', $ref->{priv}, $field[2], $field[4]);
$self->send(pc85($main::mycall, $field[2], $field[3],"$main::mycall:your attempt is logged, Tut tut tut...!"));
}
} else {
- my $ref = DXUser->get_current($field[1]);
+ my $ref = DXUser->get_current($call);
if ($ref && $ref->is_clx) {
- $self->route($field[1], $line);
+ $self->route($call, $line);
} else {
- $self->route($field[1], pc34($field[2], $field[1], $field[4]));
+ $self->route($call, pc34($field[2], $call, $field[4]));
}
}
return;
}
if ($pcno == 85) { # remote command replies
- if ($field[1] eq $main::mycall) {
+ my $call = $field[1];
+ if ($call eq $main::mycall) {
my $dxchan = DXChannel->get($field[3]);
if ($dxchan) {
$dxchan->send($field[4]);
}
}
} else {
- my $ref = DXUser->get_current($field[1]);
+ my $ref = DXUser->get_current($call);
if ($ref && $ref->is_clx) {
- $self->route($field[1], $line);
+ $self->route($call, $line);
} else {
- $self->route($field[1], pc35($field[2], $field[1], $field[4]));
+ $self->route($call, pc35($field[2], $call, $field[4]));
}
}
return;
#
if (eph_dup($line)) {
- dbg('chan', "PCPROT: Ephemeral dup, dropped");
+ dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr');
} else {
unless ($self->{isolate}) {
broadcast_ak1a($line, $self); # send it to everyone but me
# send a pc50 out on this channel
$dxchan->{pc50_t} = $main::systime unless exists $dxchan->{pc50_t};
if ($t >= $dxchan->{pc50_t} + $DXProt::pc50_interval) {
- my $s = pc50(scalar DXChannel::get_all_users);
+ my $s = pc50($me, scalar DXChannel::get_all_users);
eph_dup($s);
$dxchan->send($s);
$dxchan->{pc50_t} = $t;
my @localnodes;
my @remotenodes;
- dbg('trace', 'DXProt::send_local_config');
+ dbg('DXProt::send_local_config') if isdbg('trace');
# send our nodes
if ($self->{isolate}) {
# get all the users connected on the above nodes and send them out
foreach $n (@localnodes, @remotenodes) {
- send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users);
+ if ($n) {
+ send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users);
+ } else {
+ dbg("sent a null value") if isdbg('chanerr');
+ }
}
}
my ($self, $call, $line) = @_;
if (ref $self && $call eq $self->{call}) {
- dbg('chan', "PCPROT: Trying to route back to source, dropped");
+ dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
return;
}
$dxchan = $cl->dxchan if $cl;
if (ref $dxchan) {
if (ref $self && $dxchan eq $self) {
- dbg('chan', "PCPROT: Trying to route back to source, dropped");
+ dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
return;
}
}
$dxchan->send($routeit);
}
} else {
- dbg('chan', "PCPROT: No route available, dropped");
+ dbg("PCPROT: No route available, dropped") if isdbg('chanerr');
}
}
($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref;
next unless $filter;
}
- next if $sort eq 'ann' && !$dxchan->{ann};
+ next if $sort eq 'ann' && !$dxchan->{ann} && $s !~ /^To\s+LOCAL\s+de\s+(?:$main::myalias|$main::mycall)/i;
next if $sort eq 'wwv' && !$dxchan->{wwv};
next if $sort eq 'wcy' && !$dxchan->{wcy};
next if $sort eq 'wx' && !$dxchan->{wx};
}
# do routing stuff
-# my $node = Route::Node::get($self->{call});
-# my @rout = $node->del_nodes if $node;
- my @rout = $main::routeroot->del_node($call);
- dbg('route', "B/C PC21 (from PC39) for: " . join(',', (map{ $_->call } @rout))) if @rout;
+ my $node = Route::Node::get($call);
+ my @rout;
+ if ($node) {
+ @rout = $node->del_nodes; # at the next level
+ @rout = $node->del($main::routeroot);
+ }
# unbusy and stop and outgoing mail
my $mref = DXMsg::get_busy($call);
my ($filter, $hops);
my @rin;
- if ($self->{routefilter}) {
- for (; @_ && $no; $no--) {
- my $r = shift;
- ($filter, $hops) = $self->{routefilter}->it($self->{call}, $self->{dxcc}, $self->{itu}, $self->{cq}, $r->call, $r->dxcc, $r->itu, $r->cq);
- push @rin, $r if $filter;
+ for (; @_ && $no; $no--) {
+ my $r = shift;
+
+ if ($self->{routefilter}) {
+ $filter = undef;
+ if ($r) {
+ ($filter, $hops) = $self->{routefilter}->it($self->{call}, $self->{dxcc}, $self->{itu}, $self->{cq}, $r->call, $r->dxcc, $r->itu, $r->cq);
+ if ($filter) {
+ push @rin, $r;
+ } else {
+ dbg("DXPROT: $self->{call}/" . $r->call . " rejected by output filter") if isdbg('chanerr');
+ }
+ } else {
+ dbg("was sent a null value") if isdbg('chanerr');
+ }
+ } else {
+ push @rin, $r;
}
}
if (@rin) {
$routeit = adjust_hops($self, $line); # adjust its hop count by node name
next unless $routeit;
}
- $self->send($routeit);
+ $self->send($routeit) if $self->{routefilter} || !$self->{isolate};
}
}
}
foreach $dxchan (@dxchan) {
next if $dxchan == $self;
next if $dxchan == $me;
- $dxchan->send_route($generate, @_);
+ if ($self->{routefilter} || !$self->{isolate}) {
+ $dxchan->send_route($generate, @_)
+ } else {
+ dbg('DXPROT: isolated') if isdbg('chanerr');
+ }
}
}
broadcast_route($self, \&pc21, scalar @_, @_);
}
+sub route_pc24
+{
+ my $self = shift;
+ broadcast_route($self, \&pc24, 1, @_);
+}
+
+sub route_pc41
+{
+ my $self = shift;
+ broadcast_route($self, \&pc41, 1, @_);
+}
+
+sub route_pc50
+{
+ my $self = shift;
+ broadcast_route($self, \&pc50, 1, @_);
+}
+
+sub in_filter_route
+{
+ my $self = shift;
+ my $r = shift;
+ my ($filter, $hops) = (1, 1);
+
+ if ($self->{inroutefilter}) {
+ ($filter, $hops) = $self->{inroutefilter}->it($self->{call}, $self->{dxcc}, $self->{itu}, $self->{cq}, $r->call, $r->dxcc, $r->itu, $r->cq);
+ dbg("PCPROT: $self->{call}/" . $r->call . ' rejected by in_filter_route') if !$filter && isdbg('chanerr');
+ }
+ return $filter;
+}
+
sub eph_dup
{
my $s = shift;
projects / spider.git / blobdiff