X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=f7c85a6f9a18ad2bb4fe12672eb5cdba06c4002d;hb=a13f69ce9f26ea2b95be1e6de1f14f50ab7065d8;hp=d471b71b8aba42fcdd77ae67a2e7493f9836010e;hpb=7e3729a9039462c460dae4804f40c0bd506f3423;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index d471b71b..f7c85a6f 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -115,7 +115,6 @@ use Mojolicious 7.26;
 use Mojo::IOLoop;
 $DOWARN = 1;
 
-use DXDebug;
 use Msg;
 use IntMsg;
 use Internet;
@@ -169,6 +168,7 @@ use IsoTime;
 use BPQMsg;
 use RBN;
 use DXCIDR;
+use DXDebug;
 
 use Data::Dumper;
 use IO::File;
@@ -176,8 +176,6 @@ use Fcntl ':flock';
 use POSIX ":sys_wait_h";
 use Web;
 
-use vars qw($version $build $gitversion $gitbranch);
-
 use strict;
 
 use Local;
@@ -189,9 +187,6 @@ $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
@@ -223,6 +218,14 @@ 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) 
 
+our @localhost_names = qw(127.0.0.1 ::1); # all ip addresses that will need to be aliased below (ipv4 or ipv6)
+
+our $localhost_alias_ipv4;		# these are the IPV4 & 6 aliases for localhost connected clients
+our $localhost_alias_ipv6;		# for things (PC92, PC61 etc) that expose IP addresses. These *may*
+                                # be set by Msg.pm stuff if they are left undefined but, if you need
+                                # certanty then set/var them in the startup file.
+
+our $save_route_cache;			# save and restore route cache on restart. Probably only useful for G1TLH testing
 
 use vars qw($version $subversion $build $gitversion $gitbranch);
 
@@ -306,13 +309,20 @@ sub new_channel
 		}
 
 		# now deal with the lock
+		my $host = $conn->peerhost;
 		if ($lock) {
-			my $host = $conn->peerhost;
 			LogDbg('', "$call on $host is locked out, disconnected");
 			$conn->disconnect;
 			return;
 		}
 
+		# Is he from a badip?
+		if (DXCIDR::find($host)) {
+			LogDbg('', "$call on $host is from a badip $host, disconnected");
+			$conn->disconnect;
+			return;
+		}
+
 		# set up the basic channel info for "Normal" Users
 		# is there one already connected to me - locally?
 
@@ -420,7 +430,7 @@ sub login
 	return \&new_channel;
 }
 
-our $ceasing;
+my $ceasing;
 
 # cease running this program, close down all the connections nicely
 sub cease
@@ -430,6 +440,8 @@ sub cease
 	cluck("ceasing") if $ceasing; 
 	
 	return if $ceasing++;
+
+	dbg("DXSpider Ceasing");
 	
 	unless ($is_win) {
 		$SIG{'TERM'} = 'IGNORE';
@@ -453,18 +465,23 @@ sub cease
 	UDPMsg::finish();
 
 	# end everything else
+	QSL::finish();
 	RBN::finish();
-	DXUser::finish();
 	DXDupe::finish();
 
 	# close all databases
 	DXDb::closeall;
 
+	# Write route cache
+	Route::write_cache() if $save_route_cache;
+	
 	# close all listeners
 	foreach my $l (@listeners) {
 		$l->close_server;
 	}
 
+	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();
@@ -506,7 +523,6 @@ sub AGWrestart
 	AGWMsg::init(\&new_channel);
 }
 
-
 sub setup_start
 {
 	#############################################################
@@ -536,12 +552,6 @@ sub setup_start
 	# log our path
 	dbg "Perl path: " . join(':', @INC);
 	
-	# try to load the database
-	if (DXSql::init($dsn)) {
-		$dbh = DXSql->new($dsn);
-		$dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
-	}
-
 	# try to load Encode and Git
 	{
 		local $^W = 0;
@@ -584,6 +594,37 @@ sub setup_start
 		$SIG{__DIE__} = $w;
 	}
 
+	unless ($is_win) {
+		$SIG{HUP} = 'IGNORE';
+		$SIG{CHLD} = sub { $zombies++ };
+
+		$SIG{PIPE} = sub { 	dbg("Broken PIPE signal received"); };
+		$SIG{IO} = sub { 	dbg("SIGIO received"); };
+		$SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE';
+		$SIG{KILL} = 'DEFAULT';	# as if it matters....
+
+		# catch the rest with a hopeful message
+		for (keys %SIG) {
+			if (!$SIG{$_}) {
+				#		dbg("Catching SIG $_") if isdbg('chan');
+				$SIG{$_} = sub { my $sig = shift;	DXDebug::confess("Caught signal $sig");  };
+			}
+		}
+	}
+
+
+	# banner
+	my ($year) = (gmtime)[5];
+	$year += 1900;
+	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");
+
+	# prime some signals
+	unless ($DB::VERSION) {
+		$SIG{INT} = $SIG{TERM} = sub { $ending = 10; };
+	}
+
 
 	# setup location of motd & issue
 	localdata_mv($motd);
@@ -594,11 +635,6 @@ sub setup_start
 	# try to load XML::Simple
 	DXXml::init();
 
-	# banner
-	my ($year) = (gmtime)[5];
-	$year += 1900;
-	LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O started");
-	dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
 
 	# load Prefixes
 	dbg("loading prefixes ...");
@@ -616,22 +652,19 @@ sub setup_start
 
 	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;
 		my $ref = DXUser::get($mycall);
-		die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+		die "\$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
 		my $oldsort = $ref->sort;
 		if ($oldsort ne 'S') {
 			$ref->sort('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;
+		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');
@@ -639,7 +672,26 @@ sub setup_start
 		}
 	}
 
-
+	# make sure that mycall, myalias and homenode are upper case;
+	my $flag = 0;
+	if ($mycall =~ /[a-z]/) {
+		LogDbg('err', "\$mycall '$mycall' contains lower case letters, correcting");
+		$mycall = uc $mycall;
+		++$flag;
+	}
+	if ($myalias =~ /[a-z]/) {
+		LogDbg('err', "\$myalias '$myalias' contains lower case letters, correcting");
+		$myalias = uc $myalias;
+		++$flag;
+	}
+	if ($flag) {
+		LogDbg('err', "DXVars.pm has $flag errors. See above. Please edit DXVars.pm to correct");
+		sleep 10;
+	}
+	
+	# read any route cache there might be
+	Route::read_cache() if $save_route_cache;
+	
 	# start listening for incoming messages/connects
 	dbg("starting listeners ...");
 	my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
@@ -667,35 +719,6 @@ sub setup_start
 	dbg("UDP Listener") if $UDPMsg::enable;
 	UDPMsg::init(\&new_channel);
 
-	# load bad words
-	dbg("load badwords: " . (BadWords::load or "Ok"));
-
-	# prime some signals
-	unless ($DB::VERSION) {
-		$SIG{INT} = $SIG{TERM} = sub { $ending = 10; };
-	}
-
-	# get any bad IPs 
-	DXCIDR::init();
-
-	unless ($is_win) {
-		$SIG{HUP} = 'IGNORE';
-		$SIG{CHLD} = sub { $zombies++ };
-
-		$SIG{PIPE} = sub { 	dbg("Broken PIPE signal received"); };
-		$SIG{IO} = sub { 	dbg("SIGIO received"); };
-		$SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE';
-		$SIG{KILL} = 'DEFAULT';	# as if it matters....
-
-		# catch the rest with a hopeful message
-		for (keys %SIG) {
-			if (!$SIG{$_}) {
-				#		dbg("Catching SIG $_") if isdbg('chan');
-				$SIG{$_} = sub { my $sig = shift;	DXDebug::confess("Caught signal $sig");  };
-			}
-		}
-	}
-
 	# start dupe system
 	dbg("Starting Dupe system");
 	DXDupe::init();
@@ -708,12 +731,6 @@ sub setup_start
 	dbg("Read in Aliases");
 	CmdAlias->init();
 
-	# initialise the Geomagnetic data engine
-	dbg("Start WWV");
-	Geomag->init();
-	dbg("Start WCY");
-	WCY->init();
-
 	# initialise the protocol engine
 	dbg("Start Protocol Engines ...");
 	DXProt->init();
@@ -722,6 +739,16 @@ sub setup_start
 	my $script = new Script "startup";
 	$script->run($main::me) if $script;
 
+
+	# initialise the Geomagnetic data engine
+	dbg("Start WWV system");
+	Geomag->init();
+	dbg("Start WCY system");
+	WCY->init();
+	dbg("Start Announce and Talk system");
+	AnnTalk::init();			# initialise announce cache
+   
+
 	# 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);
@@ -737,25 +764,41 @@ sub setup_start
 	dbg("Starting DX Spot system");
 	Spot->init();
 
+	# try to load the spot database if present
+	if (DXSql::init($dsn)) {
+		$dbh = DXSql->new($dsn);
+		$dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
+	}
+
+
 	# read in any existing message headers and clean out old crap
-	dbg("reading existing message headers ...");
+	dbg("Reading existing Message/Bulletine headers ...");
 	DXMsg->init();
 	DXMsg::clean_old();
 
 	# read in any cron jobs
-	dbg("reading cron jobs ...");
+	dbg("Reading cron jobs ...");
 	DXCron->init();
 
 	# read in database desriptors
-	dbg("reading database descriptors ...");
+	dbg("Reading database descriptors ...");
 	DXDb::load();
 
-	dbg("starting RBN ...");
+	dbg("Rtarting RBN ...");
 	RBN::init();
 
 	# starting local stuff
-	dbg("doing local initialisation ...");
+	dbg("Starting DXQsl system");
 	QSL::init(1);
+
+	# load bad words
+	BadWords::load();
+
+	# get any bad IPs 
+	DXCIDR::init();
+
+
+	dbg("Ooing local initialisations ...");
 	if (defined &Local::init) {
 		eval {
 			Local::init();
@@ -765,7 +808,7 @@ sub setup_start
 
 
 	# this, such as it is, is the main loop!
-	dbg("orft we jolly well go ...");
+	dbg("Orft we jolly well go ...");
 
 	#open(DB::OUT, "|tee /tmp/aa");
 }
@@ -853,6 +896,7 @@ sub per_minute
 sub per_10_minute
 {
 	RBN::per_10_minute();
+	Route::write_cache() if $save_route_cache;
 }
 
 sub per_hour
@@ -893,3 +937,10 @@ cease(0);
 
 exit(0);
 
+sub END
+{
+	unless ($ceasing) {
+		print "DXSpider Ending\n";
+		cease();
+	}
+}