X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=68f40e1aa83eff76c8b11aad87c49cb7a00718be;hb=1bb3ae1a09a6117d93c02041bff9b5cd2d4819ef;hp=d6e323276696098ed4e2928cfb110facd4c2dd63;hpb=8c9e806b29c6d127f67801ef99862090f067f50d;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index d6e32327..68f40e1a 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>;
@@ -97,6 +97,9 @@ use Route::User;
 use Editable;
 use Mrtg;
 use USDB;
+use UDPMsg;
+use QSL;
+use Thingy;
 
 use Data::Dumper;
 use IO::File;
@@ -124,7 +127,7 @@ $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 += 7;				# add an offset to make it bigger than last system
+$main::build += 4;				# add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -239,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;
@@ -275,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();
@@ -324,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;
@@ -395,8 +408,9 @@ 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 ...");
@@ -426,8 +440,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"));
 
@@ -505,6 +524,7 @@ DXDb::load();
 
 # starting local stuff
 dbg("doing local initialisation ...");
+QSL::init(1);
 eval {
 	Local::init();
 };
@@ -539,7 +559,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
 		};