From e2978821d42b1fc4afb1106dcdbcc5af13edb635 Mon Sep 17 00:00:00 2001
From: Dirk Koopman <djk@tobit.co.uk>
Date: Sun, 2 Jan 2022 08:12:17 +0000
Subject: [PATCH] fix dx bug introduced by ip <ipaddr>

---
 Changes   | 2 ++
 cmd/dx.pl | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Changes b/Changes
index 1cb9c781..517ec77d 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+02Jan22=======================================================================
+1. Fix dx bug introduced to handle dx by ip <ipaddr> for webclusters.
 01Jan22=======================================================================
 1. Fixed missing ';' in spoof
 30Dec21=======================================================================
diff --git a/cmd/dx.pl b/cmd/dx.pl
index 306fb77b..792f4b7e 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -18,7 +18,7 @@ my $valid = 0;
 my $localonly;
 my $oline = $line;
 
-#$DB::single=1;
+$DB::single=1;
 
 return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 return (1, $self->msg('e28')) unless $self->isregistered;
@@ -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 =~ s/^\s*//;
 $line =~ s/\t+/ /g;				# do this here because it needs to be stopped ASAP!
 $line ||= ' ';
 
-- 
2.43.0