X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=e8e56dc1e596e91408cd50bab9e7544933a58fee;hb=23bb5e1bb2403e57f59d22fd8f4f0514d9a963df;hp=306fb77bf7fe4d9cfd0dbe946020abecc128fcc5;hpb=2fcde747f87384dddafee9fae391b2d9b94375c3;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 306fb77b..e8e56dc1 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -45,7 +45,7 @@ if ($f[0] =~ /^by$/i) {
 	return (1, $self->msg('e5')) unless $main::allowdxby || $self->priv > 1;
     $spotter = uc $f[1];
     $line =~ s/^\s*$f[0]\s+$f[1]\s+//;
-	@f = split /\s+/, $line, 3;
+	@f = split /\s+/, $line, 3; 
 	return (1, $self->msg('dx2')) unless @f >= 2;
 }
 
@@ -56,7 +56,7 @@ if ($f[0] eq 'ip') {
 	if (is_ipaddr($f[1])) {
 		$ipaddr = $f[1];
 	} else {
-		return (1, $self->msg('dx3', $f[1]));
+		return (1, $self->msg('dx4', $f[1]));
 	}
 	$line =~ s/^\s*$f[0]\s+$f[1]\s+//;
 	@f = split /\s+/, $line, 3;
@@ -73,7 +73,9 @@ 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]\s+$f[1]\s+//;
+$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 ||= ' ';
 
@@ -93,7 +95,7 @@ my $callnoid = basecall($self->{call});
 if ($DXProt::baddx->in($spotted)) {
 	$localonly++; 
 }
-if ($DXProt::badspotter->in($spotternoid)) { 
+if ($DXProt::badspotter->in($spotternoid) || $self->badip) { 
 	LogDbg('DXCommand', "badspotter $spotternoid as $spotter ($oline) from $addr");
 	$localonly++; 
 }
@@ -170,7 +172,7 @@ if ($freq =~ /^69/ || $localonly) {
 } else {
 	# send orf to the users
 	$ipaddr ||= $main::mycall;	# emergency backstop
-	my $spot = DXProt::pc61($spotter, $freq, $spotted, $line,  $ipaddr);
+	my $spot = DXProt::pc61($spotter, $freq, $spotted, unpad($line),  $ipaddr);
 	
 	$self->dx_spot(undef, undef, @spot);
 	if ($self->isslugged) {