X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=99c2ef82a674362f5c1aa34df27d165553c34efa;hb=bf5eb90cfb12c5070db6726af98d1d464bdb4ea3;hp=dfb571b280c3333d91cc8502090a0659040fab4a;hpb=20c965763d3341e97e09f608f1419a933df1d742;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index dfb571b2..99c2ef82 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -286,7 +286,7 @@ sub normal # 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; } @@ -295,7 +295,7 @@ sub normal 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: { @@ -305,7 +305,7 @@ sub normal 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; } } @@ -340,13 +340,13 @@ sub normal # 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; } @@ -354,13 +354,13 @@ sub normal 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; } @@ -368,17 +368,17 @@ sub normal $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; } } @@ -388,7 +388,7 @@ sub normal 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; } } @@ -455,7 +455,7 @@ sub normal 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! @@ -470,14 +470,14 @@ sub normal # 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; } } @@ -502,7 +502,7 @@ sub normal 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; } } @@ -534,19 +534,23 @@ sub normal 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++) { @@ -587,19 +591,23 @@ sub normal 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; } + + # 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; @@ -610,11 +618,7 @@ sub normal # 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()); @@ -642,22 +646,27 @@ sub normal 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) { + if ($self->in_filter_route($r)) { + $ar = $parent->add($call, $ver, $flags); + push @rout, $ar if $ar; + } + } + if ($r->version ne $ver || $r->flags != $flags) { $r->version($ver); - $r->flags(Route::here($here)|Route::conf($conf)); + $r->flags($flags); + push @rout, $r unless $ar; + } + } else { + next if $call eq $main::mycall || $call eq $self->{call}; + + my $new = Route->new($call); # throw away + if ($self->in_filter_route($new)) { + my $r = $parent->add($call, $ver, $flags); push @rout, $r; } } @@ -696,21 +705,25 @@ sub normal my @rout; my $parent = Route::Node::get($self->{call}); unless ($parent) { - dbg('chan', "PCPROT: Route::Node $call not in config"); + 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 - push @rout, $node->del($parent) if $node; + 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; @@ -740,11 +753,11 @@ sub normal 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 @@ -755,7 +768,7 @@ sub normal 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! @@ -773,6 +786,9 @@ sub normal $ref = Route::User::get($call); $ref->here($field[2]) if $ref; + # input filter if required + return unless $self->in_filter_route($ref); + $self->route_pc24($ref, $field[3]) if $ref && !eph_dup($line); return; } @@ -783,7 +799,7 @@ sub normal 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; } @@ -886,7 +902,7 @@ sub normal 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; } @@ -912,6 +928,10 @@ sub normal $user->lastoper($main::systime); # to cut down on excessive for/opers being generated $user->put; 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; } @@ -931,6 +951,10 @@ sub normal 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); } return; @@ -995,12 +1019,12 @@ sub normal # do some de-duping 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 ($call $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; } @@ -1010,7 +1034,7 @@ sub normal 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 @@ -1093,7 +1117,7 @@ sub normal # 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 @@ -1410,7 +1434,7 @@ sub send_local_config my @localnodes; my @remotenodes; - dbg('trace', 'DXProt::send_local_config'); + dbg('DXProt::send_local_config') if isdbg('trace'); # send our nodes if ($self->{isolate}) { @@ -1437,7 +1461,7 @@ sub send_local_config if ($n) { send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users); } else { - dbg('chan', "sent a null value"); + dbg("sent a null value") if isdbg('chanerr'); } } } @@ -1452,7 +1476,7 @@ sub route 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; } @@ -1463,7 +1487,7 @@ sub route $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; } } @@ -1474,7 +1498,7 @@ sub route $dxchan->send($routeit); } } else { - dbg('chan', "PCPROT: No route available, dropped"); + dbg("PCPROT: No route available, dropped") if isdbg('chanerr'); } } @@ -1724,15 +1748,23 @@ sub send_route my ($filter, $hops); my @rin; - if ($self->{routefilter}) { - for (; @_ && $no; $no--) { - my $r = shift; + 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); - push @rin, $r if $filter; + if ($filter) { + push @rin, $r; + } else { + dbg("DXPROT: $self->{call}/" . $r->call . " rejected by output filter") if isdbg('chanerr'); + } } else { - dbg('chan', "was sent a null value"); + dbg("was sent a null value") if isdbg('chanerr'); } + } else { + push @rin, $r; } } if (@rin) { @@ -1744,7 +1776,7 @@ sub send_route $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}; } } } @@ -1760,7 +1792,11 @@ sub broadcast_route foreach $dxchan (@dxchan) { next if $dxchan == $self; next if $dxchan == $me; - $dxchan->send_route($generate, @_); + if ($dxchan->{routefilter} || !$self->{isolate}) { + $dxchan->send_route($generate, @_) + } else { + dbg('DXPROT: isolated') if isdbg('chanerr'); + } } } @@ -1806,7 +1842,18 @@ sub route_pc50 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 {