X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=d4e9981a2e3df54c649d2dbd806139041ef7f316;hb=b06fd1d447d5411d8d441e807f93efa897b68aaf;hp=6bd0c7440aeb1f0a9556bfdc0e7c4d2ba690a2e0;hpb=2090157518d0d2da860345507680f4ad91b043a2;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 6bd0c744..d4e9981a 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -40,12 +40,16 @@ BEGIN {
 	eval {
 		require local::lib;
 	};
-	import local::lib unless ($@);
+	unless ($@) {
+#		import local::lib;
+		import local::lib qw(/spider/perl5lib);
+	} 
 
 	# root of directory tree for this system
 	$root = "/spider";
 	$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
 
+	unshift @INC, "$root/perl5lib" unless grep {$_ eq "$root/perl5lib"} @INC;
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
 
@@ -90,12 +94,11 @@ use DXVars;
 use SysVar;
 
 # order here is important - DXDebug snarfs Carp et al so that Mojo errors go into the debug log
-use DXDebug;
 use Mojolicious 7.26;
 use Mojo::IOLoop;
-
 $DOWARN = 1;
 
+use DXDebug;
 use Msg;
 use IntMsg;
 use Internet;
@@ -147,7 +150,7 @@ use DXXml;
 use DXSql;
 use IsoTime;
 use BPQMsg;
-
+use RBN;
 
 
 use Data::Dumper;
@@ -192,6 +195,7 @@ our $ending;					# signal that we are ending;
 our $broadcast_debug;			# allow broadcasting of debug info down "enhanced" user connections
 our $clssecs;					# the amount of cpu time the DXSpider process have consumed
 our $cldsecs;					# the amount of cpu time any child processes have consumed
+our $allowslashcall;			# Allow / in connecting callsigns (ie PA0/G1TLH, or even PA0/G1TLH/2) 
 
 
 # send a message to call on conn and disconnect
@@ -234,7 +238,7 @@ sub new_channel
 			$user->long($main::mylongitude);
 			$user->qra($main::mylocator);
 		}
-		$user->startt($main::systime);
+		$user->startt($main::systime);	
 		$conn->conns($call);
 		$dxchan = Web->new($call, $conn, $user);
 		$dxchan->enhanced(1);
@@ -249,15 +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;
 		}
@@ -349,7 +354,9 @@ sub new_channel
 		
 		$user->startt($systime); # mark the start time of this connection
 		if ($user->is_node) {
-			$dxchan = DXProt->new($call, $conn, $user);
+			$dxchan = DXProt->new($call, $conn, $user);	
+		} elsif ($user->is_rbn) {
+			$dxchan = RBN->new($newcall, $conn, $user);
 		} elsif ($user->is_user) {
 			$dxchan = DXCommandmode->new($newcall, $conn, $user);
 		} else {
@@ -408,6 +415,7 @@ sub cease
 	UDPMsg::finish();
 
 	# end everything else
+	RBN::finish();
 	DXUser::finish();
 	DXDupe::finish();
 
@@ -480,12 +488,14 @@ sub setup_start
 	}
 
 	# open the debug file, set various FHs to be unbuffered
-	dbginit($broadcast_debug ? \&DXCommandmode::broadcast_debug : undef);
+	dbginit(undef, $broadcast_debug ? \&DXCommandmode::broadcast_debug : undef);
 	foreach (@debug) {
 		dbgadd($_);
 	}
 	STDOUT->autoflush(1);
 
+	# log our path
+	dbg "Perl path: " . join(':', @INC);
 	
 	# try to load the database
 	if (DXSql::init($dsn)) {
@@ -558,6 +568,9 @@ sub setup_start
 	dbg("loading user file system ...");
 	DXUser::init(4);			# version 4 == json format
 
+	Filter::init();				# doesn't do much, but has to be done
+	
+
 	# look for the sysop and the alias user and complain if they aren't there
 	{
 		die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
@@ -566,14 +579,14 @@ sub setup_start
 		my $oldsort = $ref->sort;
 		if ($oldsort ne 'S') {
 			$ref->sort('S');
-			dbg "Resetting node type from $oldsort -> DXSpider ('S')";
+			dbg("Resetting node type from $oldsort -> DXSpider ('S')");
 		}
 		$ref = DXUser::get($myalias);
 		die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
 		$oldsort = $ref->sort;
 		if ($oldsort ne 'U') {
 			$ref->sort('U');
-			dbg "Resetting sysop user type from $oldsort -> User ('U')";
+			dbg("Resetting sysop user type from $oldsort -> User ('U')");
 		}
 	}
 
@@ -647,14 +660,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);
@@ -666,6 +679,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();
@@ -679,6 +696,9 @@ sub setup_start
 	dbg("reading database descriptors ...");
 	DXDb::load();
 
+	dbg("starting RBN ...");
+	RBN::init();
+
 	# starting local stuff
 	dbg("doing local initialisation ...");
 	QSL::init(1);
@@ -692,8 +712,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");
 }
@@ -733,7 +751,7 @@ sub idle_loop
 			$main::me->disconnect;
 		}
 
-		Mojo::IOLoop->stop if --$ending <= 0;
+		Mojo::IOLoop->stop_gracefully if --$ending <= 0;
 	}
 }
 
@@ -751,19 +769,19 @@ sub per_sec
 	IsoTime::update($systime);
 	DXCommandmode::process(); # process ongoing command mode stuff
 	DXProt::process();		# process ongoing ak1a pcxx stuff
-	DXCron::process();      # do cron jobs
 	DXXml::process();
 	DXConnect::process();
 	DXMsg::process();
 	DXDb::process();
 	DXUser::process();
 	DXDupe::process();
-	DXCron::process();			# do cron jobs
 	IsoTime::update($systime);
 	DXConnect::process();
 	DXUser::process();
 	AGWMsg::process();
-	
+	DXCron::process();			# do cron jobs
+	RBN::process();
+
 	Timer::handler();
 	DXLog::flushall();
 }
@@ -773,20 +791,19 @@ sub per_10_sec
 
 }
 
-
 sub per_minute
 {
-
+	RBN::per_minute();
 }
 
 sub per_10_minute
 {
-
+	RBN::per_10_minute();
 }
 
 sub per_hour
 {
-
+	RBN::per_hour();
 }
 
 sub per_day