X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=59a03030908e922db892a69bde896b8eee29b9ce;hb=refs%2Fremotes%2Fserver%2Fspider2;hp=f1cf1227ca77b3b55f55fad314c1861b7860af44;hpb=0f5b89524c760b174f9788bdd1f1b4bed3aa9e2d;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index f1cf1227..59a03030 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -33,7 +33,7 @@ BEGIN {
 
 	# try to create and lock a lockfile (this isn't atomic but 
 	# should do for now
-	$lockfn = "$root/perl/cluster.lck";       # lock file name
+	$lockfn = "$root/local/cluster.lck";       # lock file name
 	if (-e $lockfn) {
 		open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 		my $pid = <CLLOCK>;
@@ -96,6 +96,10 @@ use Route::Node;
 use Route::User;
 use Editable;
 use Mrtg;
+use USDB;
+use UDPMsg;
+use QSL;
+use Thingy;
 
 use Data::Dumper;
 use IO::File;
@@ -114,7 +118,7 @@ use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.51";				# the version no of the software
+$version = "2.00";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();				# list of listeners
@@ -122,8 +126,8 @@ $reqreg = 0;					# 1 = registration required, 2 = deregister people
 
 use vars qw($VERSION $BRANCH $build $branch);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += 8;				# add an offset to make it bigger than last system
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/,(0,0));
+$main::build += 4;				# add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -238,6 +242,13 @@ sub rec
 	}
 }
 
+# remove any outstanding entries on the inqueue after a disconnection (usually)
+sub clean_inqueue
+{
+	my $dxchan = shift;
+	@inqueue = grep {$_->{dxchan} != $dxchan} @inqueue;
+}
+
 sub login
 {
 	return \&new_channel;
@@ -274,6 +285,9 @@ sub cease
 	# disconnect AGW
 	AGWMsg::finish();
 
+	# disconnect UDP customers
+	UDPMsg::finish();
+
 	# end everything else
 	Msg->event_loop(100, 0.01);
 	DXUser::finish();
@@ -323,7 +337,7 @@ sub process_inqueue
 		return unless defined $sort;
 	
 		# do the really sexy console interface bit! (Who is going to do the TK interface then?)
-		dbg("<- $sort $call $line\n") if $sort ne 'D' && isdbg('chan');
+		dbg("<- $sort $call $line") if $sort ne 'D' && isdbg('chan');
 		if ($self->{disconnecting}) {
 			dbg('In disconnection, ignored');
 			next;
@@ -383,18 +397,21 @@ foreach (@debug) {
 STDOUT->autoflush(1);
 
 # calculate build number
-$build += $main::version;
 $build = "$build.$branch" if $branch;
 
 Log('cluster', "DXSpider V$version, build $build started");
 
 # banner
-dbg("Copyright (c) 1998-2002 Dirk Koopman G1TLH");
+my ($year) = (gmtime($main::systime))[5];
+$year += 1900;
+dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
 dbg("DXSpider Version $version, build $build started");
 
 # load Prefixes
 dbg("loading prefixes ...");
-Prefix::load();
+dbg(USDB::init());
+my $r = Prefix::init();
+confess $r if $r;
 
 # load band data
 dbg("loading band data ...");
@@ -424,8 +441,13 @@ foreach my $l (@main::listen) {
 	push @listeners, $conn;
 	dbg("External Port: $l->[0] $l->[1]");
 }
+
+dbg("AGW Listener") if $AGWMsg::enable;
 AGWrestart();
 
+dbg("UDP Listener") if $UDPMsg::enable;
+UDPMsg::init(\&new_channel);
+
 # load bad words
 dbg("load badwords: " . (BadWords::load or "Ok"));
 
@@ -453,28 +475,34 @@ unless ($is_win) {
 }
 
 # start dupe system
+dbg("Starting Dupe system");
 DXDupe::init();
 
 # read in system messages
+dbg("Read in Messages");
 DXM->init();
 
 # read in command aliases
+dbg("Read in Aliases");
 CmdAlias->init();
 
 # initialise the Geomagnetic data engine
+dbg("Start WWV");
 Geomag->init();
+dbg("Start WCY");
 WCY->init();
 
 # initial the Spot stuff
+dbg("Starting DX Spot system");
 Spot->init();
 
 # initialise the protocol engine
-dbg("reading in duplicate spot and WWV info ...");
+dbg("Start Protocol Engines ...");
 DXProt->init();
 QXProt->init();
 
 # 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 = Route::Node->new($mycall, $version*100+5251, Route::here($main::me->here)|Route::conf($main::me->conf));
 
 # make sure that there is a routing OUTPUT node default file
 #unless (Filter::read_in('route', 'node_default', 0)) {
@@ -497,6 +525,7 @@ DXDb::load();
 
 # starting local stuff
 dbg("doing local initialisation ...");
+QSL::init(1);
 eval {
 	Local::init();
 };
@@ -531,7 +560,10 @@ for (;;) {
 		DXUser::process();
 		DXDupe::process();
 		AGWMsg::process();
-				
+
+		# this where things really start to happen (in DXSpider 2)
+		Thingy::process();
+		
 		eval { 
 			Local::process();       # do any localised processing
 		};