From: Dirk Koopman <djk@tobit.co.uk>
Date: Sat, 18 Mar 2023 00:06:48 +0000 (+0000)
Subject: fix  and moan if mycall and myalias are lowercase
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=49d7cd28623df3c4accf72d48f74b4b00238a81a;p=spider.git

fix  and moan if mycall and myalias are lowercase
---

diff --git a/Changes b/Changes
index 840bcdc0..6d25e1a7 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,8 @@
 2. Do some housekeeping with the startup and finish debugging to make the 
    order of messaging more logical. Also disable some messaging caused by 
    other errors/circumstances causing various object handles disappearing.  
+3. Make sure that $mycall and $myalias are upper case (and moan about it if
+   they aren't.
 10Mar23=======================================================================
 1. I am aware that there are windows nodes out there on mojo (brave, impetuous 
    that you are) and wget is not an easy option to download badip files. So, 
diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 7481ed84..116b69e6 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -354,7 +354,7 @@ sub close
 	my $ip = shift;
 	# add a record to the connect list
 	$self->{lastin} = $main::systime;
-	my $ref = [$startt || $self->{startt}, $main::systime];
+	my $ref = [$self->{startt} || $startt, $main::systime];
 	push @$ref, $ip if $ip;
 	push @{$self->{connlist}}, $ref;
 	shift @{$self->{connlist}} if @{$self->{connlist}} > $maxconnlist;
diff --git a/perl/cluster.pl b/perl/cluster.pl
index 7188ed6f..c2e32b5f 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -625,6 +625,7 @@ sub setup_start
 		$SIG{INT} = $SIG{TERM} = sub { $ending = 10; };
 	}
 
+
 	# setup location of motd & issue
 	localdata_mv($motd);
 	$motd = localdata($motd);
@@ -656,14 +657,14 @@ sub setup_start
 	{
 		die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
 		my $ref = DXUser::get($mycall);
-		die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+		die "\$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
 		my $oldsort = $ref->sort;
 		if ($oldsort ne 'S') {
 			$ref->sort('S');
 			dbg("Resetting node type from $oldsort -> DXSpider ('S')");
 		}
 		$ref = DXUser::get($myalias);
-		die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+		die "\$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
 		$oldsort = $ref->sort;
 		if ($oldsort ne 'U') {
 			$ref->sort('U');
@@ -671,6 +672,23 @@ sub setup_start
 		}
 	}
 
+	# make sure that mycall, myalias and homenode are upper case;
+	my $flag = 0;
+	if ($mycall =~ /[a-z]/) {
+		LogDbg('err', "\$mycall '$mycall' contains lower case letters, correcting");
+		$mycall = uc $mycall;
+		++$flag;
+	}
+	if ($myalias =~ /[a-z]/) {
+		LogDbg('err', "\$myalias '$myalias' contains lower case letters, correcting");
+		$myalias = uc $myalias;
+		++$flag;
+	}
+	if ($flag) {
+		LogDbg('err', "DXVars.pm has $flag errors. See above. Please edit DXVars.pm to correct");
+		sleep 10;
+	}
+	
 	# read any route cache there might be
 	Route::read_cache() if $save_route_cache;