use Spot;
use DXProtout;
use DXDebug;
+use Filter;
use Local;
use Carp;
$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");
return;
}
- my $spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]);
+ my @spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]);
+
+ #
+ # @spot at this point contains:-
+ # 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;
+ # DON'T be silly and send on PC26s!
+ return if $pcno == 26;
+
+ # send out the filtered spots
+ 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
+ # taking into account filtering and so on
+ foreach $dxchan (@dxchan) {
+ next if $dxchan == $self;
+ my $routeit;
+ my ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @spot, $self->{call} ) if $dxchan->{spotfilter};
+ 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};
+ }
+ }
+
# send orf to the users
- if ($spot && $pcno == 11) {
+ if (@spot) {
my $buf = Spot::formatb($field[1], $field[2], $d, $text, $spotter);
- broadcast_users("$buf\a\a", 'dx', $spot);
+ broadcast_users("$buf\a\a", 'dx', $spot[0]);
}
- # DON'T be silly and send on PC26s!
- return if $pcno == 26;
-
- last SWITCH;
+ return;
}
if ($pcno == 12) { # announces
# queue mail
DXMsg::queue_msg(0);
+
return;
}
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;
}
@nodes = (DXCluster->get_exact($main::mycall));
} else {
# create a list of all the nodes that are not connected to this connection
- @nodes = DXNode::get_all();
+ # 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 } @nodes;
+ @nodes = grep { !($_->dxchan && $_->dxchan->isolate) } @nodes;
}
my @s = $me->pc19(@nodes);
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 {