From: Dirk Koopman <djk@tobit.co.uk>
Date: Wed, 22 Dec 2021 21:18:04 +0000 (+0000)
Subject: add ip <ipaddress> to dx by <spotter>
X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?p=spider.git;a=commitdiff_plain;h=867c86a1f58144199f3a37a7b58ee8058452cbad

add ip <ipaddress> to dx by <spotter>

This is for webclusters and can only be used by privileged users
---

diff --git a/Changes b/Changes
index 69032476..a28f5a25 100644
--- a/Changes
+++ b/Changes
@@ -8,7 +8,13 @@
    spots to PC61 where the spotter's IP is known.
 3. Add a shell script "perlbrew-dxspider" that can be used for starting the
    node when using perlbrew (i.e. more modern perls) on older distros such
-   as Centos 7/8. 
+   as Centos 7/8.
+4. Allow to "dx by <spotter> ip <ip address> <qrg> <spot call> <comment>.
+   This is added as a convenience measure for webcluster authors while waiting
+   for the internal websocket interface (or because they cannot use that). 
+   This can only be used by suitably privileged users. 
+   This likely to be a temporary measure and will be immediately withdrawn if
+   there is any sign of abuse. 
 11Dec21=======================================================================
 1. Removed dependency on perl Git package.
 2. Force code to change directory to $DXSPIDER_ROOT || '/spider'. Also force
diff --git a/cmd/dx.pl b/cmd/dx.pl
index 27099f24..f86b46a6 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -38,14 +38,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];
@@ -56,14 +69,14 @@ 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/\t+/ /g;				# do this here because it needs to be stopped ASAP!
+$line ||= ' ';
 
-
-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 
+	$ipaddr ||= $addr; # force a PC61 
 } elsif ($self->inscript) {
 	$ipaddr = "script";
 }
@@ -90,10 +103,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;
@@ -157,15 +166,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) {
diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index a0bc6ab9..c2358c3d 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -360,6 +360,11 @@ sub is_rbn
 	return $_[0]->{sort} eq 'N';
 }
 
+sub is_dslink
+{
+	return $_[0]->{sort} eq 'L';
+}
+
 # for perl 5.004's benefit
 sub sort
 {
diff --git a/perl/Messages b/perl/Messages
index 80b4f46d..2554d270 100644
--- a/perl/Messages
+++ b/perl/Messages
@@ -68,6 +68,7 @@ package DXM;
 				dx1 => 'Frequency $_[0] not in band (see show/band); usage: DX [BY call] freq call comments',
 				dx2 => 'Need a callsign; usage: DX [BY call] freq call comments',
 				dx3 => 'The callsign or frequency is invalid',
+				dx4 => 'The ip address ($_[0]) is invalid',
 				dxcqs => 'DX CQ Zones enabled for $_[0]',
 				dxcqu => 'DX CQ Zones disabled for $_[0]',
 				dxitus => 'DX ITU Zones enabled for $_[0]',