X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=6ddaa30b0b7f329e5aab1937ee85944087ced4d0;hb=cc49b8f8c2ec3a975c7ace3f5bd8679580288406;hp=3e57deb6dca15f9acebf0bd847f96228a88dbb8a;hpb=0309cb55ee4d6ee5a8d68792d945c429d16c09bd;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 3e57deb6..6ddaa30b 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -12,7 +12,8 @@
 
 package main;
 
-require 5.10.1;
+require 5.16.1;
+
 use warnings;
 
 use vars qw($root $is_win $systime $lockfn @inqueue $starttime $lockfn @outstanding_connects
@@ -20,30 +21,46 @@ use vars qw($root $is_win $systime $lockfn @inqueue $starttime $lockfn @outstand
 			$clusterport $mycall $decease $routeroot $me $reqreg $bumpexisting
 			$allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
 			$can_encode $maxconnect_user $maxconnect_node $idle_interval $log_flush_interval
-			$broadcast_debug 
+			$broadcast_debug $yes $no $user_interval
 		   );
 
-$lang = 'en';					# default language
-$clusteraddr = '127.0.0.1';		# cluster tcp host address - used for things like console.pl
-$clusterport = 27754;			# cluster tcp port
-$yes = 'Yes';					# visual representation of yes
-$no = 'No';						# ditto for no
-$user_interval = 11*60;			# the interval between unsolicited prompts if no traffic
+#$lang = 'en';					# default language
+#$clusteraddr = '127.0.0.1';		# cluster tcp host address - used for things like console.pl
+#$clusterport = 27754;			# cluster tcp port
+#$yes = 'Yes';					# visual representation of yes
+#$no = 'No';						# ditto for no
+#$user_interval = 11*60;			# the interval between unsolicited prompts if no traffic
+
+package main;
+
+# set default paths, these should be overwritten by DXVars.pm
+use vars qw($data $system $cmd $localcmd $userfn $clusteraddr $clusterport $yes $no $user_interval $lang $local_data);
+
+$lang = 'en';                   # default language
+$yes = 'Yes';                   # visual representation of yes
+$no = 'No';                     # ditto for no
+$user_interval = 11*60;         # the interval between unsolicited prompts if no traffic
+
 
 # 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";
 
@@ -56,8 +73,13 @@ BEGIN {
 	mkdir "$root/local_cmd", 02774 unless -d "$root/local_cmd";
 
 	# locally stored data lives here
-	my $local_data = "$root/local_data";
+	$local_data = "$root/local_data";
 	mkdir $local_data, 02774 unless -d $local_data;
+	$data = "$root/data";
+	$system = "$root/sys";
+	$cmd = "$root/cmd";
+	$localcmd = "$root/local_cmd";
+	$userfn = "$data/users";
 
 	# try to create and lock a lockfile (this isn't atomic but
 	# should do for now
@@ -84,17 +106,16 @@ 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;
@@ -133,7 +154,7 @@ use AnnTalk;
 use BBS;
 use WCY;
 use BadWords;
-use Timer;
+use DXTimer;
 use Route;
 use Route::Node;
 use Route::User;
@@ -146,8 +167,8 @@ use DXXml;
 use DXSql;
 use IsoTime;
 use BPQMsg;
-
-
+use RBN;
+use DXCIDR;
 
 use Data::Dumper;
 use IO::File;
@@ -155,11 +176,20 @@ use Fcntl ':flock';
 use POSIX ":sys_wait_h";
 use Web;
 
-use vars qw($version $build $gitversion $gitbranch);
+use strict;
 
 use Local;
 
+$lang //= 'en';					# default language
+$clusteraddr //= '127.0.0.1';   # cluster tcp host address - used for things like console.pl
+$clusterport //= 27754;			# cluster tcp port
+$yes //= 'Yes';					# visual representation of yes
+$no //= 'No';				    # ditto for no
+$user_interval //= 11*60;		# the interval between unsolicited prompts if no traffic
 
+
+$clusteraddr //= '127.0.0.1';     # cluster tcp host address - used for things like console.pl
+$clusterport //= 27754;           # cluster tcp port
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
 $starttime = 0;                 # the starting time of the cluster
@@ -189,7 +219,10 @@ 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) 
+
 
+use vars qw($version $subversion $build $gitversion $gitbranch);
 
 # send a message to call on conn and disconnect
 sub already_conn
@@ -218,7 +251,8 @@ sub new_channel
 			already_conn($conn, $call, "Maximum no of web connected connects ($Web::maxssid) exceeded");
 			return;
 		}
-		$call = $newcall;
+		$call = normalise_call($newcall);
+		
 		$user = DXUser::get_current($call);
 		unless ($user) {
 			$user = DXUser->new($call);
@@ -231,7 +265,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);
@@ -240,23 +274,33 @@ sub new_channel
 		$conn->send_now("C$call");
 	} else {
 		# "Normal" connections
+
+		# normalise calls like G1TST-0/G1TST-00/G1TST-01 to G1TST and G1TST-1 respectively
+		my $ncall = normalise_call($call);
+		if ($call ne $ncall) {
+			LogDbg('err', "new_channel login invalid $call converted to $ncall");
+			$msg =~ s/$call/$ncall/;
+			$call = $ncall;
+		}
+		# is it a valid callsign (in format)?
 		unless (is_callsign($call)) {
 			already_conn($conn, $call, DXM::msg($lang, "illcall", $call));
 			return;
 		}
 
 		# is he locked out ?
+		my $lock;
+		$conn->conns($call);
 		$user = DXUser::get_current($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
-			$user = DXUser::get_current($basecall);
-			$lock = $user->lockout if $user;
+		} elsif ($basecall ne $call) {
+			# if there isn't a SSID on the $call, then try the base
+			my $luser = DXUser::get_current($basecall);
+			$lock = $luser->lockout if $luser;
 		}
 
 		# now deal with the lock
@@ -346,7 +390,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 {
@@ -372,7 +418,7 @@ sub login
 	return \&new_channel;
 }
 
-our $ceasing;
+my $ceasing;
 
 # cease running this program, close down all the connections nicely
 sub cease
@@ -382,6 +428,8 @@ sub cease
 	cluck("ceasing") if $ceasing; 
 	
 	return if $ceasing++;
+
+	dbg("DXSpider Ceasing");
 	
 	unless ($is_win) {
 		$SIG{'TERM'} = 'IGNORE';
@@ -405,7 +453,8 @@ sub cease
 	UDPMsg::finish();
 
 	# end everything else
-	DXUser::finish();
+	QSL::finish();
+	RBN::finish();
 	DXDupe::finish();
 
 	# close all databases
@@ -416,7 +465,9 @@ sub cease
 		$l->close_server;
 	}
 
-	LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) ended");
+	DXUser::finish();
+
+	LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O ended");
 	dbg("bye bye everyone - bye bye");
 	dbgclose();
 	Logclose();
@@ -460,13 +511,14 @@ sub AGWrestart
 
 sub setup_start
 {
-
 	#############################################################
 	#
 	# The start of the main line of code
 	#
 	#############################################################
 
+	chdir $root;
+	
 	$starttime = $systime = time;
 	$systime_days = int ($systime / 86400);
 	$systime_daystart = $systime_days * 86400;
@@ -477,12 +529,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)) {
@@ -500,26 +554,25 @@ sub setup_start
 			import Encode;
 			$can_encode = 1;
 		}
+
 		$gitbranch = 'none';
 		$gitversion = 'none';
-		eval { require Git; };
-		unless ($@) {
-			import Git;
 		
-			# determine the real version number
-			my $repo = Git->repository(Directory => "$root/.git");
-			if ($repo) {
-				my $desc = $repo->command_oneline(['describe', '--long'], STDERR => 0);
-				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");
-					$version = $v;
-					$build = $b || 0;
-					$gitversion = "$g\[r]";
-				}
-				my @branch = $repo->command([qw{branch}], STDERR=>0);
+		# determine the real Git build number and branch
+		my $desc;
+		eval {$desc = `git --git-dir=$root/.git describe --long`};
+		if (!$@ && $desc) {
+			my ($v, $s, $b, $g) = $desc =~ /^([\d\.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
+			$version = $v;
+			my $subversion = $s || 0; # not used elsewhere
+			$build = $b || 0;
+			$gitversion = "$g\[r]";
+		}
+		if (!$@) {
+			my @branch;
+
+			eval {@branch = `git --git-dir=$root/.git branch`};
+			unless ($@) {
 				for (@branch) {
 					my ($star, $b) = split /\s+/;
 					if ($star eq '*') {
@@ -529,17 +582,26 @@ 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();
 
 	# banner
 	my ($year) = (gmtime)[5];
 	$year += 1900;
-	LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) started");
-	dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
+	LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O started");
+	LogDbg('cluster', "Copyright (c) 1998-$year Dirk Koopman G1TLH");
+	LogDbg('cluster', "Capabilities: ve7cc rbn");
 
 	# load Prefixes
 	dbg("loading prefixes ...");
@@ -555,6 +617,12 @@ 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
+
+	AnnTalk::init();			# initialise announce cache
+	
+	
+
 	# 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;
@@ -563,17 +631,18 @@ 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')");
 		}
 	}
 
+
 	# start listening for incoming messages/connects
 	dbg("starting listeners ...");
 	my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
@@ -591,6 +660,7 @@ sub setup_start
 		dbg("External Port: $l->[0] $l->[1] using ${pkg}::${login}");
 	}
 
+
 	dbg("AGW Listener") if $AGWMsg::enable;
 	AGWrestart();
 
@@ -608,6 +678,9 @@ sub setup_start
 		$SIG{INT} = $SIG{TERM} = sub { $ending = 10; };
 	}
 
+	# get any bad IPs 
+	DXCIDR::init();
+
 	unless ($is_win) {
 		$SIG{HUP} = 'IGNORE';
 		$SIG{CHLD} = sub { $zombies++ };
@@ -644,14 +717,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);
@@ -663,6 +736,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();
@@ -676,6 +753,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);
@@ -689,8 +769,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");
 }
@@ -730,7 +808,7 @@ sub idle_loop
 			$main::me->disconnect;
 		}
 
-		Mojo::IOLoop->stop if --$ending <= 0;
+		Mojo::IOLoop->stop_gracefully if --$ending <= 0;
 	}
 }
 
@@ -748,20 +826,20 @@ 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();
-	
-	Timer::handler();
+	DXCron::process();			# do cron jobs
+	RBN::process();
+
+	DXTimer::handler();
 	DXLog::flushall();
 }
 
@@ -770,20 +848,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
@@ -798,6 +875,7 @@ sub start_node
 	Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
 	dbg("After Web::start_node");
+
 }
 
 setup_start();
@@ -818,3 +896,10 @@ cease(0);
 
 exit(0);
 
+sub END
+{
+	unless ($ceasing) {
+		print "DXSpider Ending\n";
+		cease();
+	}
+}