X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=27099f243a2a5f9dba15ec8034da0f3f1d6ca296;hb=daaad9dda3a184f2b3ecd23891eda101995d036f;hp=c18a2df372f9d7751e8df8adcc7182a611b8ab64;hpb=1935ba236a7ef4999bceb00b6faf28038f3b052e;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index c18a2df3..27099f24 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -18,8 +18,10 @@ my $valid = 0;
 my $localonly;
 my $oline = $line;
 
+#$DB::single=1;
+
 return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
-return (1, $self->msg('e28')) unless $self->registered;
+return (1, $self->msg('e28')) unless $self->isregistered;
 
 my @bad;
 if (@bad = BadWords::check($line)) {	
@@ -60,7 +62,8 @@ 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 unless !is_ipaddr($addr) || $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
+	$ipaddr = $addr; # force a PC61 
 } elsif ($self->inscript) {
 	$ipaddr = "script";
 }
@@ -141,6 +144,8 @@ 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);
 
+#$DB::single = 1;
+
 if ($freq =~ /^69/ || $localonly) {
 
 	# heaven forfend that we get a 69Mhz band :-)
@@ -149,21 +154,25 @@ if ($freq =~ /^69/ || $localonly) {
 	}
 
 	$self->dx_spot(undef, undef, @spot);
+
 	return (1);
 } else {
-	if (@spot) {
-		# store it 
-		Spot::add(@spot);
-
 		# send orf to the users
-		my $spot;
-
-		if ($ipaddr) {
-			$spot = DXProt::pc61($spotter, $freq, $spotted, $line, $ipaddr);
-		} else {
-			$spot = DXProt::pc11($spotter, $freq, $spotted, $line);
-		}
+	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);
 	}
 }