X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=55e0badbcfd0484abd98606facb4253b00c4f2aa;hb=4dfc1f60733b682dc1ac9724fd75395d1c41c62d;hp=07fd6ab594630c0606a48bae4932f3abf38e4d2d;hpb=9c8f43f26a7db08c4ff6ef2213c95c9f509abe36;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 07fd6ab5..55e0badb 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -253,16 +253,16 @@ sub new_channel
 		}
 
 		# is he locked out ?
+		my $lock;
 		$user = DXUser::get_current($call);
 		$conn->conns($call);
 		my $basecall = $call;
-		$basecall =~ s/-\d+$//;	# remember this for later multiple user processing
-		my $lock;
+		$basecall =~ s/-\d+$//;	# remember this for later multiple user processing, it's used for other stuff than checking lockout status
 		if ($user) {
 			# make sure we act on any locked status that the actual incoming call has.
 			$lock = $user->lockout;
-		} elsif ($allowmultiple && $call ne $basecall) {
-		    # if we are allowing multiple connections and there is a basecall minus incoming ssid, use the basecall's lock status
+		} elsif ($basecall ne $call) {
+			# if there isn't a SSID on the $call, then try the base
 			$user = DXUser::get_current($basecall);
 			$lock = $user->lockout if $user;
 		}
@@ -545,6 +545,12 @@ sub setup_start
 		$SIG{__DIE__} = $w;
 	}
 
+	# setup location of motd & issue
+	localdata_mv($motd);
+	$motd = localdata($motd);
+	localdata_mv("issue");
+	
+
 	# try to load XML::Simple
 	DXXml::init();
 
@@ -660,14 +666,14 @@ sub setup_start
 	dbg("Start WCY");
 	WCY->init();
 
-	# initial the Spot stuff
-	dbg("Starting DX Spot system");
-	Spot->init();
-
 	# initialise the protocol engine
 	dbg("Start Protocol Engines ...");
 	DXProt->init();
 
+	# read startup script
+	my $script = new Script "startup";
+	$script->run($main::me) if $script;
+
 	# 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));
 	$routeroot->do_pc9x(1);
@@ -679,6 +685,10 @@ sub setup_start
 	#	$Route::filterdef->cmd($main::me, 'route', 'accept', "node_default call $mycall" );
 	#}
 
+	# initial the Spot stuff
+	dbg("Starting DX Spot system");
+	Spot->init();
+
 	# read in any existing message headers and clean out old crap
 	dbg("reading existing message headers ...");
 	DXMsg->init();
@@ -708,8 +718,6 @@ sub setup_start
 
 	# this, such as it is, is the main loop!
 	dbg("orft we jolly well go ...");
-	my $script = new Script "startup";
-	$script->run($main::me) if $script;
 
 	#open(DB::OUT, "|tee /tmp/aa");
 }
@@ -749,7 +757,7 @@ sub idle_loop
 			$main::me->disconnect;
 		}
 
-		Mojo::IOLoop->stop if --$ending <= 0;
+		Mojo::IOLoop->stop_gracefully if --$ending <= 0;
 	}
 }