added broadcast_all_ak1a so that local commands go to isolated clusters

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 6645856299290e239c3e885c3d7409aee29fe6ea..bda2979ec83ffefdb927612dea0c3f2f628b3081 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -65,7 +65,6 @@ if (!$valid) {
 }
 
 
-
 push @out, $self->msg('dx1', $freq) if !$valid;
 
 # check we have a callsign :-)
@@ -80,15 +79,20 @@ return (1, @out) if !$valid;
 # change ^ into : for transmission
 $line =~ s/\^/:/og;
 
-# Store it here
-if (Spot::add($freq, $spotted, $main::systime, $line, $spotter)) {
-       # send orf to the users
+# Store it here (but only if it isn't baddx)
+if (grep $_ eq $spotted, @DXProt::baddx) {
        my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
-       DXProt::broadcast_users($buf);
-
-
-       # send it orf to the cluster (hang onto your tin helmets)!
-       DXProt::broadcast_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line));
+       push @out, $buf;
+} else {
+       my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
+       if (@spot) {
+               # send orf to the users
+               my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
+               DXProt::broadcast_users($buf, 'dx', \@spot);
+
+               # send it orf to the cluster (hang onto your tin helmets) 
+               DXProt::broadcast_all_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line), $DXProt::me);
+       }
 }
 
 return (1, @out);