X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?p=spider.git;a=blobdiff_plain;f=cmd%2Fdx.pl;h=046af6a479b945d87bf83151eb1223ce1239f8f9;hp=20046781a68f27f6f45f293c3bdf15b67a258e61;hb=f63d598af3f797b56b8d5e23ec4ff5254192eee9;hpb=773d6294a511631a12a8ececb73023aa01443925

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 20046781..046af6a4 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -5,7 +5,7 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -16,14 +16,22 @@ my $freq;
 my @out;
 my $valid = 0;
 my $localonly;
-return (1, $self->msg('e5')) if $self->remotecmd;
-return (1, $self->msg('e28')) unless $self->registered;
+my $oline = $line;
+
+#$DB::single=1;
+
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
+return (1, $self->msg('e28')) unless $self->isregistered;
+
+
+my $addr = $self->hostname || '127.0.0.1';
+Log('cmd', "$self->{call}|$addr|dx|$line");
 
 my @bad;
 if (@bad = BadWords::check($line)) {	
 	$self->badcount(($self->badcount||0) + @bad);
-	Log('DXCommand', "$self->{call} swore: $line");
-	$localonly++;
+	LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
+	$localonly++; 
 }
 
 # do we have at least two args?
@@ -34,13 +42,27 @@ return (1, $self->msg('dx2')) unless @f >= 2;
 # can be in any order
 
 if ($f[0] =~ /^by$/i) {
+	return (1, $self->msg('e5')) unless $main::allowdxby || $self->priv > 1;
     $spotter = uc $f[1];
-    $line =~ s/^\s*\Q$f[0]\s+\Q$f[1]\s+//;
-	$line = $f[2];
-	@f = split /\s+/, $line;
+    $line =~ s/^\s*$f[0]\s+$f[1]\s+//;
+	@f = split /\s+/, $line, 3; 
 	return (1, $self->msg('dx2')) unless @f >= 2;
 }
 
+my $ipaddr;
+@f = split /\s+/, $line, 3;
+if ($f[0] eq 'ip') {
+	return (1, $self->msg('e5')) unless $spotter &&  $self->priv > 1;
+	if (is_ipaddr($f[1])) {
+		$ipaddr = $f[1];
+	} else {
+		return (1, $self->msg('dx4', $f[1]));
+	}
+	$line =~ s/^\s*$f[0]\s+$f[1]\s+//;
+	@f = split /\s+/, $line, 3;
+}
+
+
 # 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];
@@ -51,10 +73,43 @@ if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
 } else {
 	return (1, $self->msg('dx3'));
 }
+$line =~ s/^\s*$f[0]//;
+$line =~ s/^\s*$f[1]//;
+$line =~ unpad($line);
+$line =~ s/\t+/ /g;				# do this here because it needs to be stopped ASAP!
+$line ||= ' ';
+
+if ($self->conn && $self->conn->peerhost) {
+	$ipaddr ||= $addr; # force a PC61 
+} elsif ($self->inscript) {
+	$ipaddr = "script";
+}
+
+# check some other things
+# remove ssid from calls
+my $spotternoid = basecall($spotter);
+my $callnoid = basecall($self->{call});
+
+#$DB::single = 1;
+
+if ($DXProt::baddx->in($spotted)) {
+	++$localonly; 
+}
+if ($DXProt::badspotter->in($spotternoid)) { 
+	LogDbg('DXCommand', "badspotter $spotternoid as $spotter ($oline) from $ipaddr");
+	++$localonly; 
+}
+if ($ipaddr && DXCIDR::find($ipaddr)) {
+	LogDbg('DXCommand', "Bad IP address $ipaddr $spotternoid as $spotter ($oline)");
+	++$localonly; 
+}
 
-# make line the rest of the line
-$line = $f[2] || " ";
-@f = split /\s+/, $line;
+#dbg "spotter $spotternoid/$callnoid\";
+
+if (($spotted =~ /$spotternoid/ || $spotted =~ /$callnoid/) && $freq < $Spot::minselfspotqrg) {
+	LogDbg('DXCommand', "$spotternoid/$callnoid trying to self spot below ${Spot::minselfspotqrg}KHz ($oline) from $addr, not passed on to cluster");
+	$localonly++;
+}
 
 # bash down the list of bands until a valid one is reached
 my $bandref;
@@ -103,10 +158,12 @@ return (1, @out) unless $valid;
 
 # 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);
+return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line, $spotter, $main::mycall);
+my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall, $ipaddr);
 
-if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
+#$DB::single = 1;
+
+if ($freq =~ /^69/ || $localonly) {
 
 	# heaven forfend that we get a 69Mhz band :-)
 	if ($freq =~ /^69/) {
@@ -114,14 +171,20 @@ if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
 	}
 
 	$self->dx_spot(undef, undef, @spot);
+
 	return (1);
 } else {
-	if (@spot) {
-		# store it 
+	# send orf to the users
+	$ipaddr ||= $main::mycall;	# emergency backstop
+	my $spot = DXProt::pc61($spotter, $freq, $spotted, unpad($line),  $ipaddr);
+	
+	$self->dx_spot(undef, undef, @spot);
+	if ($self->isslugged) {
+		push @{$self->{sluggedpcs}}, [61, $spot, \@spot];
+	} else {
+		# store in spots database 
 		Spot::add(@spot);
-
-		# send orf to the users
-		DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
+		DXProt::send_dx_spot($self, $spot, @spot);
 	}
 }
 
@@ -129,5 +192,3 @@ return (1, @out);
 
 
 
-
-