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

diff --git a/perl/cluster.pl b/perl/cluster.pl
index d471b71b..2cbdee68 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -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
@@ -306,13 +301,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 +422,7 @@ sub login
 	return \&new_channel;
 }
 
-our $ceasing;
+my $ceasing;
 
 # cease running this program, close down all the connections nicely
 sub cease
@@ -430,6 +432,8 @@ sub cease
 	cluck("ceasing") if $ceasing; 
 	
 	return if $ceasing++;
+
+	dbg("DXSpider Ceasing");
 	
 	unless ($is_win) {
 		$SIG{'TERM'} = 'IGNORE';
@@ -453,8 +457,8 @@ sub cease
 	UDPMsg::finish();
 
 	# end everything else
+	QSL::finish();
 	RBN::finish();
-	DXUser::finish();
 	DXDupe::finish();
 
 	# close all databases
@@ -465,6 +469,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();
@@ -598,7 +604,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 ...");
@@ -668,7 +675,7 @@ 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) {
@@ -893,3 +900,10 @@ cease(0);
 
 exit(0);
 
+sub END
+{
+	unless ($ceasing) {
+		print "DXSpider Ending\n";
+		cease();
+	}
+}