X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=f1cf1227ca77b3b55f55fad314c1861b7860af44;hb=0f5b89524c760b174f9788bdd1f1b4bed3aa9e2d;hp=205d2fe7633060eac89f6df4f7d329b775b75e33;hpb=759df8855ee49f596b8b55a95b93a0ca1c9b78b7;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 205d2fe7..f1cf1227 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -28,7 +28,7 @@ BEGIN {
 	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" unless -e "$root/local_cmd";
+	mkdir "$root/local_cmd", 0777 unless -d "$root/local_cmd";
 	
 
 	# try to create and lock a lockfile (this isn't atomic but 
@@ -95,6 +95,7 @@ use Route;
 use Route::Node;
 use Route::User;
 use Editable;
+use Mrtg;
 
 use Data::Dumper;
 use IO::File;
@@ -113,7 +114,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.51";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();				# list of listeners
@@ -121,8 +122,8 @@ $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
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
+$main::build += 8;				# add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -160,7 +161,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);
@@ -171,7 +172,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) {
@@ -190,8 +191,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) {
@@ -457,6 +471,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));