X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=9e5976ee92686250a80f53dba340a14380c57101;hb=400227d4bd709387099bf224b1c00a6f988c8196;hp=d62b88b10840e291033e627f10b3e037b90b5698;hpb=c7abd10080945488d7ea9d850aba2a8b565b4c57;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index d62b88b1..9e5976ee 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -31,6 +31,17 @@ use vars qw($root $is_win $systime $lockfn @inqueue $starttime $lockfn @outstand
 #$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;
@@ -62,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
@@ -152,7 +168,7 @@ use DXSql;
 use IsoTime;
 use BPQMsg;
 use RBN;
-
+use DXCIDR;
 
 use Data::Dumper;
 use IO::File;
@@ -160,8 +176,6 @@ use Fcntl ':flock';
 use POSIX ":sys_wait_h";
 use Web;
 
-use vars qw($version $build $gitversion $gitbranch);
-
 use strict;
 
 use Local;
@@ -173,7 +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
 
-
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
 $starttime = 0;                 # the starting time of the cluster
@@ -206,6 +219,8 @@ 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
 {
@@ -233,7 +248,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);
@@ -255,6 +271,15 @@ 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;
@@ -262,8 +287,8 @@ sub new_channel
 
 		# is he locked out ?
 		my $lock;
-		$user = DXUser::get_current($call);
 		$conn->conns($call);
+		$user = DXUser::get_current($call);
 		my $basecall = $call;
 		$basecall =~ s/-\d+$//;	# remember this for later multiple user processing, it's used for other stuff than checking lockout status
 		if ($user) {
@@ -390,7 +415,7 @@ sub login
 	return \&new_channel;
 }
 
-our $ceasing;
+my $ceasing;
 
 # cease running this program, close down all the connections nicely
 sub cease
@@ -400,6 +425,8 @@ sub cease
 	cluck("ceasing") if $ceasing; 
 	
 	return if $ceasing++;
+
+	dbg("DXSpider Ceasing");
 	
 	unless ($is_win) {
 		$SIG{'TERM'} = 'IGNORE';
@@ -423,8 +450,8 @@ sub cease
 	UDPMsg::finish();
 
 	# end everything else
+	QSL::finish();
 	RBN::finish();
-	DXUser::finish();
 	DXDupe::finish();
 
 	# close all databases
@@ -435,6 +462,8 @@ sub cease
 		$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();
@@ -479,7 +508,6 @@ sub AGWrestart
 
 sub setup_start
 {
-
 	#############################################################
 	#
 	# The start of the main line of code
@@ -555,6 +583,7 @@ sub setup_start
 		$SIG{__DIE__} = $w;
 	}
 
+
 	# setup location of motd & issue
 	localdata_mv($motd);
 	$motd = localdata($motd);
@@ -568,7 +597,8 @@ sub setup_start
 	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");
+	LogDbg('cluster', "Copyright (c) 1998-$year Dirk Koopman G1TLH");
+	LogDbg('cluster', "Capabilities: ve7cc rbn");
 
 	# load Prefixes
 	dbg("loading prefixes ...");
@@ -609,6 +639,7 @@ sub setup_start
 		}
 	}
 
+
 	# start listening for incoming messages/connects
 	dbg("starting listeners ...");
 	my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
@@ -626,6 +657,7 @@ sub setup_start
 		dbg("External Port: $l->[0] $l->[1] using ${pkg}::${login}");
 	}
 
+
 	dbg("AGW Listener") if $AGWMsg::enable;
 	AGWrestart();
 
@@ -636,13 +668,16 @@ sub setup_start
 	UDPMsg::init(\&new_channel);
 
 	# load bad words
-	dbg("load badwords: " . (BadWords::load or "Ok"));
+	BadWords::load();
 
 	# 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++ };
@@ -837,6 +872,7 @@ sub start_node
 	Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
 
 	dbg("After Web::start_node");
+
 }
 
 setup_start();
@@ -857,3 +893,10 @@ cease(0);
 
 exit(0);
 
+sub END
+{
+	unless ($ceasing) {
+		print "DXSpider Ending\n";
+		cease();
+	}
+}