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

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 3596fa00..b33a8b6e 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -23,6 +23,14 @@ BEGIN {
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
 
+	# do some validation of the input
+	die "The directory $root doesn't exist, please RTFM" unless -d $root;
+	die "$root/local doesn't exist, please RTFM" unless -d "$root/local";
+	die "$root/local/DXVars.pm doesn't exist, please RTFM" unless -e "$root/local/DXVars.pm";
+	
+	mkdir "$root/local_cmd", 0777 unless -d "$root/local_cmd";
+	
+
 	# try to create and lock a lockfile (this isn't atomic but 
 	# should do for now
 	$lockfn = "$root/perl/cluster.lck";       # lock file name
@@ -60,6 +68,7 @@ use DXCommandmode;
 use DXProtVars;
 use DXProtout;
 use DXProt;
+use QXProt;
 use DXMsg;
 use DXCron;
 use DXConnect;
@@ -85,6 +94,7 @@ use Timer;
 use Route;
 use Route::Node;
 use Route::User;
+use Editable;
 
 use Data::Dumper;
 use IO::File;
@@ -98,20 +108,21 @@ package main;
 use strict;
 use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects 
 			$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr 
-			$clusterport $mycall $decease $is_win $routeroot 
+			$clusterport $mycall $decease $is_win $routeroot $me $reqreg
 		   );
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.48";				# the version no of the software
+$version = "1.50";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();				# list of listeners
+$reqreg = 0;					# 1 = registration required, 2 = deregister people
 
 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 += 14;				# add an offset to make it bigger than last system
+$main::build += 12;				# add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -161,8 +172,8 @@ sub new_channel
 	my $basecall = $call;
 	$basecall =~ s/-\d+$//;
 	my $baseuser = DXUser->get($basecall);
-	if ($baseuser && $baseuser->lockout) {
-		my $lock = $user->lockout if $user;
+	my $lock = $user->lockout if $user;
+	if ($baseuser && $baseuser->lockout || $lock) {
 		if (!$user || !defined $lock || $lock) {
 			my $host = $conn->{peerhost} || "unknown";
 			Log('DXCommand', "$call on $host is locked out, disconnected");
@@ -179,10 +190,17 @@ sub new_channel
 	
 
 	# create the channel
-	$dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
-	$dxchan = DXProt->new($call, $conn, $user) if $user->is_node;
-	$dxchan = BBS->new($call, $conn, $user) if $user->is_bbs;
-	die "Invalid sort of user on $call = $sort" if !$dxchan;
+	if ($user->is_spider) {
+		$dxchan = QXProt->new($call, $conn, $user);
+	} elsif ($user->is_node) {
+		$dxchan = DXProt->new($call, $conn, $user);
+	} elsif ($user->is_user) {
+		$dxchan = DXCommandmode->new($call, $conn, $user);
+	} elsif ($user->is_bbs) {
+		$dxchan = BBS->new($call, $conn, $user);
+	} else {
+		die "Invalid sort of user on $call = $sort";
+	}
 
 	# check that the conn has a callsign
 	$conn->conns($call) if $conn->isa('IntMsg');
@@ -230,7 +248,7 @@ sub cease
 
 	# disconnect nodes
 	foreach $dxchan (DXChannel->get_all_nodes) {
-	    $dxchan->disconnect(2) unless $dxchan == $DXProt::me;
+	    $dxchan->disconnect(2) unless $dxchan == $main::me;
 	}
 	Msg->event_loop(100, 0.01);
 
@@ -283,7 +301,7 @@ sub process_inqueue
 	while (@inqueue) {
 		my $self = shift @inqueue;
 		return if !$self;
-	
+
 		my $data = $self->{data};
 		my $dxchan = $self->{dxchan};
 		my $error;
@@ -292,16 +310,20 @@ sub process_inqueue
 	
 		# do the really sexy console interface bit! (Who is going to do the TK interface then?)
 		dbg("<- $sort $call $line\n") if $sort ne 'D' && isdbg('chan');
-
+		if ($self->{disconnecting}) {
+			dbg('In disconnection, ignored');
+			next;
+		}
+		
 		# handle A records
 		my $user = $dxchan->user;
 		if ($sort eq 'A' || $sort eq 'O') {
 			$dxchan->start($line, $sort);  
 		} elsif ($sort eq 'I') {
 			die "\$user not defined for $call" if !defined $user;
+
 			# normal input
 			$dxchan->normal($line);
-			$dxchan->disconnect if ($dxchan->{state} eq 'bye');
 		} elsif ($sort eq 'Z') {
 			$dxchan->disconnect;
 		} elsif ($sort eq 'D') {
@@ -353,7 +375,7 @@ $build = "$build.$branch" if $branch;
 Log('cluster', "DXSpider V$version, build $build started");
 
 # banner
-dbg("Copyright (c) 1998-2001 Dirk Koopman G1TLH");
+dbg("Copyright (c) 1998-2002 Dirk Koopman G1TLH");
 dbg("DXSpider Version $version, build $build started");
 
 # load Prefixes
@@ -368,6 +390,14 @@ Bands::load();
 dbg("loading user file system ..."); 
 DXUser->init($userfn, 1);
 
+# look for the sysop and the alias user and complain if they aren't there
+{
+	my $ref = DXUser->get($mycall);
+	die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+	$ref = DXUser->get($myalias);
+	die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+}
+
 # start listening for incoming messages/connects
 dbg("starting listeners ...");
 my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
@@ -429,12 +459,12 @@ dbg("reading in duplicate spot and WWV info ...");
 DXProt->init();
 
 # put in a DXCluster node for us here so we can add users and take them away
-$routeroot = Route::Node->new($mycall, $version*100+5300, Route::here($DXProt::me->here)|Route::conf($DXProt::me->conf));
+$routeroot = Route::Node->new($mycall, $version*100+5300, Route::here($main::me->here)|Route::conf($main::me->conf));
 
 # make sure that there is a routing OUTPUT node default file
 #unless (Filter::read_in('route', 'node_default', 0)) {
-#	my $dxcc = $DXProt::me->dxcc;
-#	$Route::filterdef->cmd($DXProt::me, 'route', 'accept', "node_default call $mycall" );
+#	my $dxcc = $main::me->dxcc;
+#	$Route::filterdef->cmd($main::me, 'route', 'accept', "node_default call $mycall" );
 #}
 
 # read in any existing message headers and clean out old crap
@@ -457,16 +487,10 @@ eval {
 };
 dbg("Local::init error $@") if $@;
 
-dbg("cleaning out old debug files");
-DXDebug::dbgclean();
-
-# print various flags
-#dbg("seful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P");
-
 # 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;
+$script->run($main::me) if $script;
 
 #open(DB::OUT, "|tee /tmp/aa");
 
@@ -485,6 +509,7 @@ for (;;) {
 		DXCron::process();      # do cron jobs
 		DXCommandmode::process(); # process ongoing command mode stuff
 		DXProt::process();		# process ongoing ak1a pcxx stuff
+		QXProt::process();
 		DXConnect::process();
 		DXMsg::process();
 		DXDb::process();