X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=c9b49182d09f9965c7174e295bd833649f514525;hb=309eea6bcd4a0eaf25f810168bc38dc348c2a982;hp=5baf02973ac49a4c385c95d7fc1dcf8121febd09;hpb=d9a5a954acbdca08db5c0d138e77329574cc4d52;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 5baf0297..c9b49182 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -13,6 +13,7 @@
 package main;
 
 require 5.10.1;
+
 use warnings;
 
 use vars qw($root $is_win $systime $lockfn @inqueue $starttime $lockfn @outstanding_connects
@@ -33,17 +34,22 @@ $user_interval = 11*60;			# the interval between unsolicited prompts if no traff
 # make sure that modules are searched in the order local then perl
 BEGIN {
 	umask 002;
-
+	$SIG{'__WARN__'} = sub { warn $_[0] if $DOWARN };
+			
 	# take into account any local::lib that might be present
 	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";
 
@@ -87,14 +93,12 @@ BEGIN {
 use DXVars;
 use SysVar;
 
-use strict;
-
 # 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;
@@ -146,7 +150,7 @@ use DXXml;
 use DXSql;
 use IsoTime;
 use BPQMsg;
-
+use RBN;
 
 
 use Data::Dumper;
@@ -157,6 +161,8 @@ use Web;
 
 use vars qw($version $build $gitversion $gitbranch);
 
+use strict;
+
 use Local;
 
 
@@ -189,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
@@ -231,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);
@@ -246,23 +253,31 @@ 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 $baseuser = DXUser::get_current($basecall);
-		my $lock = $user->lockout if $user;
-		if ($baseuser && $baseuser->lockout || $lock) {
-			if (!$user || !defined $lock || $lock) {
-				my $host = $conn->peerhost;
-				LogDbg('DXCommand', "$call on $host is locked out, disconnected");
-				$conn->disconnect;
-				return;
-			}
+		$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 ($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;
+		}
+
+		# now deal with the lock
+		if ($lock) {
+			my $host = $conn->peerhost;
+			LogDbg('', "$call on $host is locked out, disconnected");
+			$conn->disconnect;
+			return;
 		}
 
 		# set up the basic channel info for "Normal" Users
 		# is there one already connected to me - locally?
 
-		$user = DXUser::get_current($call);
 		$dxchan = DXChannel::get($call);
 		my $newcall = $call;
 		if ($dxchan) {
@@ -276,7 +291,7 @@ sub new_channel
 				my $allow = 0;
 				if (@lastconns >= $DXUser::maxconnlist) {
 					$allow = $lastconns[-1]->[0] - $lastconns[0]->[0] < $min_reconnection_rate;
-				}
+				} 
 				# search for a spare ssid
 			L1:	for (my $count = $call =~ /-\d+$/?0:1; $allow && $count < $allowmultiple; ) { # remember we have one call already
 					my $lastid = 1;
@@ -298,7 +313,7 @@ sub new_channel
 				if ($bumpexisting) {
 					my $ip = $dxchan->hostname;
 					$dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
-					LogDbg('DXCommand', "$call bumped off by $ip, disconnected");
+					LogDbg('', "$call bumped off by $ip, disconnected");
 					$dxchan->disconnect;
 				} else {
 					already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
@@ -322,7 +337,7 @@ sub new_channel
 			$v = defined $c ? $c : $m;
 			if ($v && @n >= $v+$allowmultiple) {
 				my $nodes = join ',', @n;
-				LogDbg('DXCommand', "$call has too many connections ($v) at $nodes - disconnected");
+				LogDbg('', "$call has too many connections ($v) at $nodes - disconnected");
 				already_conn($conn, $call, DXM::msg($lang, 'contomany', $call, $v, $nodes));
 				return;
 			}
@@ -339,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 {
@@ -349,7 +366,7 @@ sub new_channel
 	
 
 	# set callbacks
-	$conn->set_error(sub {my $err = shift; LogDbg('DXCommand', "Comms error '$err' received for call $dxchan->{call}"); $dxchan->disconnect(1);});
+	$conn->set_error(sub {my $err = shift; LogDbg('', "Comms error '$err' received for call $dxchan->{call}"); $dxchan->disconnect(1);});
 	$conn->set_on_eof(sub {$dxchan->disconnect});
 	$conn->set_rproc(sub {my ($conn,$msg) = @_; $dxchan->rec($msg);});
 	if ($sort eq 'W') {
@@ -398,6 +415,7 @@ sub cease
 	UDPMsg::finish();
 
 	# end everything else
+	RBN::finish();
 	DXUser::finish();
 	DXDupe::finish();
 
@@ -470,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)) {
@@ -506,8 +526,8 @@ sub setup_start
 				if ($desc) {
 					my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
 					$s ||= '';
-					dbg("Git: $desc");
-					dbg("Git: V=$v S=$s B=$b g=$g");
+					dbg("Git: $desc") if isdbg('git');
+					dbg("Git: V=$v S=$s B=$b g=$g") if isdbg('git');
 					$version = $v;
 					$build = $b || 0;
 					$gitversion = "$g\[r]";
@@ -548,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;
@@ -556,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')");
 		}
 	}
 
@@ -669,6 +692,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);
@@ -723,7 +749,7 @@ sub idle_loop
 			$main::me->disconnect;
 		}
 
-		Mojo::IOLoop->stop if --$ending <= 0;
+		Mojo::IOLoop->stop_gracefully if --$ending <= 0;
 	}
 }
 
@@ -741,19 +767,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();
 }
@@ -763,20 +789,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