X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=3596fa00432169199ff9dbcf55121c79c00d4ea7;hb=f9b0d39eb17d107b9f2b0c6c08652ea02c1d74ce;hp=516e7cb1eb8f57ae33478d313e97ee9627df3245;hpb=765add8acca099e69f2b2cde2bb58a48a00852d3;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 516e7cb1..3596fa00 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -67,6 +67,7 @@ use DXBearing;
 use DXDb;
 use DXHash;
 use DXDupe;
+use Script;
 use Prefix;
 use Spot;
 use Bands;
@@ -110,7 +111,7 @@ $starttime = 0;                 # the starting time of the cluster
 use vars qw($VERSION $BRANCH $build $branch);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
 $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
-$main::build += 15;				# add an offset to make it bigger than last system
+$main::build += 14;				# add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -140,7 +141,12 @@ sub new_channel
 	my ($conn, $msg) = @_;
 	my ($sort, $call, $line) = DXChannel::decode_input(0, $msg);
 	return unless defined $sort;
-	
+
+	unless (is_callsign($call)) {
+		already_conn($conn, $call, DXM::msg($lang, "illcall", $call));
+		return;
+	}
+
 	# set up the basic channel info
 	# is there one already connected to me - locally? 
 	my $user = DXUser->get($call);
@@ -150,6 +156,20 @@ sub new_channel
 		already_conn($conn, $call, $mess);
 		return;
 	}
+
+	# is he locked out ?
+	my $basecall = $call;
+	$basecall =~ s/-\d+$//;
+	my $baseuser = DXUser->get($basecall);
+	if ($baseuser && $baseuser->lockout) {
+		my $lock = $user->lockout if $user;
+		if (!$user || !defined $lock || $lock) {
+			my $host = $conn->{peerhost} || "unknown";
+			Log('DXCommand', "$call on $host is locked out, disconnected");
+			$conn->disconnect;
+			return;
+		}
+	}
 	
 	if ($user) {
 		$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
@@ -157,13 +177,6 @@ sub new_channel
 		$user = DXUser->new($call);
 	}
 	
-	# is he locked out ?
-	if ($user->lockout) {
-		my $host = $conn->{peerhost} || "unknown";
-		Log('DXCommand', "$call on $host is locked out, disconnected");
-		$conn->disconnect;
-		return;
-	}
 
 	# create the channel
 	$dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
@@ -452,6 +465,8 @@ DXDebug::dbgclean();
 
 # this, such as it is, is the main loop!
 dbg("orft we jolly well go ...");
+my $script = new Script "startup";
+$script->run($DXProt::me) if $script;
 
 #open(DB::OUT, "|tee /tmp/aa");