X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=6893b7087b77a14353204c6def891390a76f2950;hb=148f4d43135748ba5aff985c50720b370ca1e336;hp=16458073b837bf7005718fac05fe2b66e5af7aa6;hpb=892f669f9791273b2cb73d7421184f83acd5c609;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 16458073..6893b708 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
@@ -105,7 +113,7 @@ use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.49";				# 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
@@ -114,7 +122,7 @@ $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 += 12;				# add an offset to make it bigger than last system
+$main::build += 11;				# add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -152,7 +160,7 @@ sub new_channel
 
 	# set up the basic channel info
 	# is there one already connected to me - locally? 
-	my $user = DXUser->get($call);
+	my $user = DXUser->get_current($call);
 	my $dxchan = DXChannel->get($call);
 	if ($dxchan) {
 		my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call, $main::mycall);
@@ -163,7 +171,7 @@ sub new_channel
 	# is he locked out ?
 	my $basecall = $call;
 	$basecall =~ s/-\d+$//;
-	my $baseuser = DXUser->get($basecall);
+	my $baseuser = DXUser->get_current($basecall);
 	my $lock = $user->lockout if $user;
 	if ($baseuser && $baseuser->lockout || $lock) {
 		if (!$user || !defined $lock || $lock) {
@@ -182,8 +190,21 @@ sub new_channel
 	
 
 	# create the channel
-	if ($user->is_spider) {
-		$dxchan = QXProt->new($call, $conn, $user);
+	if ($user->wantnp) {
+		if ($user->passphrase && $main::me->user->passphrase) {
+			$dxchan = QXProt->new($call, $conn, $user);
+		} else {
+			unless ($user->passphrase) {
+				Log('DXCommand', "$call using NP but has no passphrase");
+				dbg("$call using NP but has no passphrase");
+			}
+			unless ($main::me->user->passphrase) {
+				Log('DXCommand', "$main::mycall using NP but has no passphrase");
+				dbg("$main::mycall using NP but has no passphrase");
+			}
+			already_conn($conn, $call, "Need to exchange passphrases");
+			return;
+		}
 	} elsif ($user->is_node) {
 		$dxchan = DXProt->new($call, $conn, $user);
 	} elsif ($user->is_user) {
@@ -293,7 +314,7 @@ sub process_inqueue
 	while (@inqueue) {
 		my $self = shift @inqueue;
 		return if !$self;
-	
+
 		my $data = $self->{data};
 		my $dxchan = $self->{dxchan};
 		my $error;
@@ -302,16 +323,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') {
@@ -363,7 +388,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
@@ -378,6 +403,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);
@@ -437,6 +470,7 @@ Spot->init();
 # initialise the protocol engine
 dbg("reading in duplicate spot and WWV info ...");
 DXProt->init();
+QXProt->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($main::me->here)|Route::conf($main::me->conf));