X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=308371fd5129273944c1031e9cac83a2e9b5eabf;hb=c001af008776b1822d9e99a28bfef500cf2d0844;hp=6645856299290e239c3e885c3d7409aee29fe6ea;hpb=61cdf7dc2b72c1898850a4d2aa403d712f22f8ee;p=spider.git diff --git a/cmd/dx.pl b/cmd/dx.pl index 66458562..308371fd 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,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_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line)); + } } return (1, @out);