hamradio/spider
1
0
Fork 0
mirror of git://scm.dxcluster.org/scm/spider synced 2024-09-21 15:57:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix and moan if mycall and myalias are lowercase

Browse Source
This commit is contained in:
Dirk Koopman 2023-03-18 00:06:48 +00:00
parent 5094a0b55d
commit 49d7cd2862
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -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,

2
perl/DXUser.pm
View File

@ -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;

22
perl/cluster.pl
View File

@ -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;