X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=7ef99411fd7d099d1de5e8838e867d02a2f6b5dd;hb=80a2dd317e5d6b24250388b5177cbf85abee5a85;hp=e1c29843a0f3b8e389893e994c293979d7e5469e;hpb=d8b3b94c40205c64e08402f4a4b272a55c14f80d;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index e1c29843..7ef99411 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -22,6 +22,7 @@ use DXLog; use Spot; use DXProtout; use DXDebug; +use Filter; use Local; use Carp; @@ -106,6 +107,11 @@ sub start $self->{isolate} = $user->{isolate}; $self->{consort} = $line; # save the connection type $self->{here} = 1; + + # get the filters + $self->{spotfilter} = Filter::read_in('spots', $call); + $self->{wwvfilter} = Filter::read_in('wwv', $call); + $self->{annfilter} = Filter::read_in('ann', $call); # set unbuffered $self->send_now('B',"0"); @@ -207,29 +213,25 @@ sub normal # # @spot at this point contains:- - # freq, spotted call, time, text, spotter, spotted cc, spotters cc, - # orig node, spotted itu, spotted cq, spotters itu, spotters cq + # freq, spotted call, time, text, spotter, spotted cc, spotters cc, orig node + # then spotted itu, spotted cq, spotters itu, spotters cq # you should be able to route on any of these # # local processing my $r; eval { - $r = Local::spot($self, $freq, $field[2], $d, $text, $spotter, $field[7]); + $r = Local::spot($self, @spot); }; # dbg('local', "Local::spot1 error $@") if $@; return if $r; - # send orf to the users - if (@spot && $pcno == 11) { - my $buf = Spot::formatb($field[1], $field[2], $d, $text, $spotter); - broadcast_users("$buf\a\a", 'dx', $spot[0]); - } - # DON'T be silly and send on PC26s! return if $pcno == 26; - - last SWITCH; + + # send out the filtered spots + send_dx_spot($self, $line, @spot) if @spot; + return; } if ($pcno == 12) { # announces @@ -374,6 +376,7 @@ sub normal # queue mail DXMsg::queue_msg(0); + return; } @@ -425,7 +428,7 @@ sub normal return if $pcno == 27; # broadcast to the eager users - broadcast_users("WWV de $field[7] <$field[2]>: SFI=$sfi, K=$k, A=$i, $field[6]", 'wwv', $wwv ); + broadcast_users("WWV de $field[7] <$field[2]>: SFI=$sfi, A=$k, K=$i, $field[6]", 'wwv', $wwv ); last SWITCH; } @@ -472,8 +475,9 @@ sub normal if ($pcno == 34 || $pcno == 36) { # remote commands (incoming) if ($field[1] eq $main::mycall) { my $ref = DXUser->get_current($field[2]); + my $cref = DXCluster->get($field[2]); Log('rcmd', 'in', $ref->{priv}, $field[2], $field[3]); - unless ($field[3] =~ /rcmd/i) { # not allowed to relay RCMDS! + unless ($field[3] =~ /rcmd/i || !$cref || !$ref || $cref->mynode->call ne $ref->homenode) { # not allowed to relay RCMDS! if ($ref->{priv}) { # you have to have SOME privilege, the commands have further filtering $self->{remotecmd} = 1; # for the benefit of any command that needs to know my @in = (DXCommandmode::run_cmd($self, $field[3])); @@ -483,9 +487,11 @@ sub normal Log('rcmd', 'out', $field[2], $_); } delete $self->{remotecmd}; + } else { + $self->send(pc35($main::mycall, $field[2], "$main::mycall:sorry...!")); } } else { - $self->send(pc35($main::mycall, $field[2], "$main::mycall:Tut tut tut...!")); + $self->send(pc35($main::mycall, $field[2], "$main::mycall:your attempt is logged, Tut tut tut...!")); } } else { route($field[1], $line); @@ -680,32 +686,73 @@ sub finish # # some active measures # +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) { + my $routeit; + my ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} ) if $dxchan->{spotfilter}; + if ($dxchan->is_ak1a) { + next if $dxchan == $self; + if ($hops) { + $routeit = $line; + $routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/; + } else { + $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name + next unless $routeit; + } + if ($filter) { + $dxchan->send($routeit) if $routeit; + } else { + $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate}; + + } + } elsif ($dxchan->is_user) { + my $buf = Spot::formatb($_[0], $_[1], $_[2], $_[3], $_[4]); + $buf .= "\a\a" if $dxchan->beep; + $dxchan->send($buf) if !$hops || ($hops && $filter); + } + } +} sub send_local_config { my $self = shift; my $n; my @nodes; - + my @localnodes; + my @remotenodes; + # send our nodes if ($self->{isolate}) { - @nodes = (DXCluster->get_exact($main::mycall)); + @localnodes = (DXCluster->get_exact($main::mycall)); } else { # create a list of all the nodes that are not connected to this connection # and are not themselves isolated, this to make sure that isolated nodes # don't appear outside of this node - @nodes = DXNode::get_all(); - @nodes = grep { $_->dxchan != $self && !$_->{isolate} } @nodes; + @nodes = DXNode::get_all(); + @nodes = grep { $_->{call} ne $main::mycall } @nodes; + @nodes = grep { $_->dxchan != $self } @nodes if @nodes; + @nodes = grep { !$_->dxchan->{isolate} } @nodes if @nodes; + @localnodes = grep { $_->dxchan->{call} eq $_->{call} } @nodes if @nodes; + unshift @localnodes, DXCluster->get_exact($main::mycall); + @remotenodes = grep { $_->dxchan->{call} ne $_->{call} } @nodes if @nodes; } - my @s = $me->pc19(@nodes); + my @s = $me->pc19(@localnodes, @remotenodes); for (@s) { my $routeit = adjust_hops($self, $_); $self->send($routeit) if $routeit; } # get all the users connected on the above nodes and send them out - foreach $n (@nodes) { + foreach $n (@localnodes, @remotenodes) { my @users = values %{$n->list}; my @s = pc16($n, @users); for (@s) { @@ -736,7 +783,8 @@ sub route } } -# broadcast a message to all clusters [except those mentioned after buffer] +# broadcast a message to all clusters taking into account isolation +# [except those mentioned after buffer] sub broadcast_ak1a { my $s = shift; # the line to be rebroadcast @@ -752,6 +800,23 @@ sub broadcast_ak1a } } +# broadcast a message to all clusters ignoring isolation +# [except those mentioned after buffer] +sub broadcast_all_ak1a +{ + my $s = shift; # the line to be rebroadcast + my @except = @_; # to all channels EXCEPT these (dxchannel refs) + my @dxchan = get_all_ak1a(); + my $dxchan; + + # send it if it isn't the except list and isn't isolated and still has a hop count + foreach $dxchan (@dxchan) { + next if grep $dxchan == $_, @except; + my $routeit = adjust_hops($dxchan, $s); # adjust its hop count by node name + $dxchan->send($routeit); + } +} + # broadcast to all users # storing the spot or whatever until it is in a state to receive it sub broadcast_users @@ -780,13 +845,19 @@ sub broadcast_list my $dxchan; foreach $dxchan (@_) { + my $filter = 1; - next if $sort eq 'dx' && !$dxchan->{dx}; + if ($sort eq 'dx') { + next unless $dxchan->{dx}; + ($filter) = Filter::it($dxchan->{spotfilter}, @{$fref}) if ref $fref; + next unless $filter; + } next if $sort eq 'ann' && !$dxchan->{ann}; next if $sort eq 'wwv' && !$dxchan->{wwv}; next if $sort eq 'wx' && !$dxchan->{wx}; $s =~ s/\a//og unless $dxchan->{beep}; + if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') { $dxchan->send($s); } else {