X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=27099f243a2a5f9dba15ec8034da0f3f1d6ca296;hb=1a9286080b21d5b65f97cab08d8a493abafad8f1;hp=b0be3bd83038c781f454acb5db9b54ff82d1e372;hpb=aad4e36d3753bf8dde671d14d73b1d9785b9ff41;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index b0be3bd8..27099f24 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,18 @@ 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 @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?
@@ -53,6 +57,39 @@ if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
 	return (1, $self->msg('dx3'));
 }
 
+
+my $ipaddr;
+my $addr = $self->hostname;
+
+if ($self->conn && $self->conn->peerhost) {
+#	$ipaddr = $addr unless !is_ipaddr($addr) || $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
+	$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 $addr");
+	$localonly++; 
+}
+
+dbg "spotter $spotternoid/$callnoid\n";
+
+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++;
+}
+
 # make line the rest of the line
 $line = $f[2] || " ";
 @f = split /\s+/, $line;
@@ -105,9 +142,11 @@ 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);
+my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall, $ipaddr);
+
+#$DB::single = 1;
 
-if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
+if ($freq =~ /^69/ || $localonly) {
 
 	# heaven forfend that we get a 69Mhz band :-)
 	if ($freq =~ /^69/) {
@@ -115,14 +154,26 @@ if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
 	}
 
 	$self->dx_spot(undef, undef, @spot);
+
 	return (1);
 } else {
-	if (@spot) {
-		# store it 
-		Spot::add(@spot);
-
 		# send orf to the users
-		DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
+	my $spot;
+
+	if ($ipaddr) {
+		$spot = DXProt::pc61($spotter, $freq, $spotted, $line, $ipaddr);
+	}
+	#else {
+	#	$spot = DXProt::pc11($spotter, $freq, $spotted, $line);
+	#}
+	
+	$self->dx_spot(undef, undef, @spot);
+	if ($self->isslugged) {
+		push @{$self->{sluggedpcs}}, [61, $spot, \@spot];
+	} else {
+		# store in spots database 
+		Spot::add(@spot);
+		DXProt::send_dx_spot($self, $spot, @spot);
 	}
 }