X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=d8dd56cbbd7ee76bf0507242d3eea7d9d8ee1ead;hb=cd5b993f99b52d3c3c51779e9ea1fa150232225e;hp=763bf9b0aace735bd8e7db629724c2c594fe15d6;hpb=9a55af9586711ecdea8dc9b0da38509119fa8090;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 763bf9b0..d8dd56cb 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -5,31 +5,76 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
-my @f = split /\s+/, $line;
+my @f = split /\s+/, $line, 3;
 my $spotter = $self->call;
 my $spotted;
 my $freq;
 my @out;
 my $valid = 0;
+my $localonly;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
+return (1, $self->msg('e28')) unless $self->registered;
+
+my @bad;
+if (@bad = BadWords::check($line)) {	
+	$self->badcount(($self->badcount||0) + @bad);
+	LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
+	$localonly++; 
+}
+
+# do we have at least two args?
+return (1, $self->msg('dx2')) unless @f >= 2;
+
+# as a result of a suggestion by Steve K9AN, I am changing the syntax of
+# 'spotted by' things to "dx by g1tlh <freq> <call>" <freq> and <call>
+# can be in any order
+
+if ($f[0] =~ /^by$/i) {
+	return (1, $self->msg('e5')) unless $main::allowdxby || $self->priv;
+    $spotter = uc $f[1];
+    $line =~ s/\s*$f[0]\s+$f[1]\s+//;
+#	$line = $f[2];
+	@f = split /\s+/, $line, 3;
+	return (1, $self->msg('dx2')) unless @f >= 2;
+}
 
-# first lets see if we think we have a callsign as the first argument
-if (defined @f && @f >= 3 && $f[0] =~ /[A-Za-z]/) {
-	$spotter = uc $f[0];
+# get the freq and callsign either way round
+if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
+	$spotted = uc $f[0];
 	$freq = $f[1];
-	$spotted = uc $f[2];
-	$line =~ s/^$f[0]\s+$f[1]\s+$f[2]\s*//;
-} elsif (defined @f && @f >= 2) {
-	$freq = $f[0];
-	$spotted = uc $f[1]; 
-	$line =~ s/^$f[0]\s+$f[1]\s*//;
-} elsif (!defined @f || @f < 2) {
-	return (1, $self->msg('dx2'));
+} elsif (is_freq($f[0]) && $f[1] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
+    $freq = $f[0];
+	$spotted = uc $f[1];
+} else {
+	return (1, $self->msg('dx3'));
 }
 
+# check some other things
+# remove ssid from calls
+my $callnoid = $self->call;
+$callnoid =~ s/-\d+$//;
+my $spotternoid = $spotter;
+$spotternoid =~ s/-\d+$//;
+if ($DXProt::baddx->in($spotted)) {
+	$localonly++; 
+}
+if ($DXProt::badspotter->in($callnoid)) { 
+	LogDbg('DXCommand', "$self->{call} badspotter with $callnoid ($line)");
+	$localonly++; 
+}
+if ($callnoid ne $spotternoid && $DXProt::badspotter->in($spotternoid)) { 
+	LogDbg('DXCommand', "$self->{call} badspotter with $spotternoid ($line)");
+	$localonly++; 
+}
+
+# make line the rest of the line
+$line = $f[2] || " ";
+@f = split /\s+/, $line;
+
 # bash down the list of bands until a valid one is reached
 my $bandref;
 my @bb;
@@ -47,7 +92,7 @@ foreach $bandref (Bands::get_all()) {
 	}
 }
 
-if (!$valid) {
+unless ($valid) {
 
 	# try again in MHZ 
 	$freq = $freq * 1000 if $freq;
@@ -65,27 +110,54 @@ if (!$valid) {
 }
 
 
-
-push @out, $self->msg('dx1', $freq) if !$valid;
+push @out, $self->msg('dx1', $freq) unless $valid;
 
 # check we have a callsign :-)
 if ($spotted le ' ') {
 	push @out, $self->msg('dx2');
-	
 	$valid = 0;
 }
 
-return (1, @out) if !$valid;
+return (1, @out) unless $valid;
 
-# Store it here
-if (Spot::add($freq, $spotted, $main::systime, $line, $spotter)) {
-	# send orf to the users
-	my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
-	DXProt::broadcast_users($buf);
+my $ipaddr;
 
+if ($self->conn->peerhost) {
+	my $addr = $self->conn->peerhost;
+	$ipaddr = $addr unless !is_ipaddr($addr) || $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
+}
+
+# Store it here (but only if it isn't baddx)
+my $t = (int ($main::systime/60)) * 60;
+return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line, $spotter);
+my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall, $ipaddr);
+
+if ($freq =~ /^69/ || $localonly) {
 
-	# send it orf to the cluster (hang onto your tin helmets)!
-	DXProt::broadcast_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line));
+	# heaven forfend that we get a 69Mhz band :-)
+	if ($freq =~ /^69/) {
+		$self->badcount(($self->badcount||0) + 1);
+	}
+
+	$self->dx_spot(undef, undef, @spot);
+	return (1);
+} else {
+	if (@spot) {
+		# store it 
+		Spot::add(@spot);
+
+		# send orf to the users
+		if ($ipaddr) {
+			DXProt::send_dx_spot($self, DXProt::pc61($spotter, $freq, $spotted, $line, $ipaddr), @spot);
+		} else {
+			DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
+		}
+	}
 }
 
 return (1, @out);
+
+
+
+
+