X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=dd780699b62e6225727aa771f064e448dc1a3ca8;hb=dd864f3c8ed69e63f9873bf1728813a7cc56aa79;hp=41c71c07ffaf9cb43f954651cb9a86dc3cbdc9f9;hpb=324bd80ed4aef7e2636f5a03288788ce11ab2663;p=spider.git diff --git a/cmd/dx.pl b/cmd/dx.pl index 41c71c07..dd780699 100644 --- 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,22 @@ 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, 'dx', $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 + DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot); + +# my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter); +# DXProt::broadcast_users("$buf\a\a", 'dx', $spot[0]); + + # 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);