X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=4a80df0e2fae37ab9202c2786b352383b6ff0d67;hb=d0b55caa8a609da9ccc5ea59bb376795a99d04b5;hp=97ed605f40000c326d33f8380e3c52731560ee52;hpb=6d0ecd3545795aecacff640efc5ccc4e01be892b;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 97ed605f..4a80df0e 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -18,8 +18,14 @@ 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 $addr = $self->hostname || '127.0.0.1'
+Log('cmd', "$self->{call}|$addr|dx|$line");
 
 my @bad;
 if (@bad = BadWords::check($line)) {	
@@ -36,14 +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;
+	return (1, $self->msg('e5')) unless $main::allowdxby || $self->priv > 1;
     $spotter = uc $f[1];
-    $line =~ s/\s*$f[0]\s+$f[1]\s+//;
-#	$line = $f[2];
+    $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('dx3', $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];
@@ -54,13 +73,12 @@ if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
 } else {
 	return (1, $self->msg('dx3'));
 }
-
-
-my $ipaddr;
-my $addr = $self->hostname;
+$line =~ s/^\s*$f[0]\s+$f[1]\s+//;
+$line =~ s/\t+/ /g;				# do this here because it needs to be stopped ASAP!
+$line ||= ' ';
 
 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";
 }
@@ -87,10 +105,6 @@ if (($spotted =~ /$spotternoid/ || $spotted =~ /$callnoid/) && $freq < $Spot::mi
 	$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;
@@ -138,7 +152,7 @@ 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);
+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);
 
 #$DB::single = 1;
@@ -154,14 +168,9 @@ if ($freq =~ /^69/ || $localonly) {
 
 	return (1);
 } else {
-		# 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);
-	}
+	# send orf to the users
+	$ipaddr ||= $main::mycall;	# emergency backstop
+	my $spot = DXProt::pc61($spotter, $freq, $spotted, $line,  $ipaddr);
 	
 	$self->dx_spot(undef, undef, @spot);
 	if ($self->isslugged) {
@@ -177,5 +186,3 @@ return (1, @out);
 
 
 
-
-