X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2Fcluster.pl;h=b45213a71ba4a5dd4f2b18bb43b24c08a2db989d;hb=54775ee86e54343a0fba66a0bbca3567de96cf46;hp=177009ea20bb4a12cf63ed6d6e8aa994285c086c;hpb=bb3889c1d4930e2ca96b47aea10ce5e803737043;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 177009ea..b45213a7 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -218,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);
 
@@ -465,7 +473,7 @@ sub cease
 	DXDb::closeall;
 
 	# Write route cache
-	Route::write_cache();
+	Route::write_cache() if $save_route_cache;
 	
 	# close all listeners
 	foreach my $l (@listeners) {
@@ -515,7 +523,6 @@ sub AGWrestart
 	AGWMsg::init(\&new_channel);
 }
 
-
 sub setup_start
 {
 	#############################################################
@@ -626,9 +633,6 @@ 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
 	{
@@ -650,7 +654,7 @@ sub setup_start
 	}
 
 	# read any route cache there might be
-	Route::read_cache();
+	Route::read_cache() if $save_route_cache;
 	
 	# start listening for incoming messages/connects
 	dbg("starting listeners ...");
@@ -720,12 +724,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();
@@ -734,6 +732,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);
@@ -750,24 +758,26 @@ sub setup_start
 	Spot->init();
 
 	# 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);
+
+	dbg("Ooing local initialisations ...");
 	if (defined &Local::init) {
 		eval {
 			Local::init();
@@ -777,7 +787,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");
 }
@@ -865,7 +875,7 @@ sub per_minute
 sub per_10_minute
 {
 	RBN::per_10_minute();
-	Route::write_cache();
+	Route::write_cache() if $save_route_cache;
 }
 
 sub per_hour