X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=177009ea20bb4a12cf63ed6d6e8aa994285c086c;hb=f8017bac9afdb84424fb70b135ed00522d3907d9;hp=718a2f1724c09fc1273dba16fbedb23b6b146331;hpb=6ec22e78a4a344ce675645fabf18b2a1971f364a;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 718a2f17..177009ea 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -187,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
@@ -304,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?
 
@@ -460,6 +464,9 @@ sub cease
 	# close all databases
 	DXDb::closeall;
 
+	# Write route cache
+	Route::write_cache();
+	
 	# close all listeners
 	foreach my $l (@listeners) {
 		$l->close_server;
@@ -642,7 +649,9 @@ sub setup_start
 		}
 	}
 
-
+	# read any route cache there might be
+	Route::read_cache();
+	
 	# start listening for incoming messages/connects
 	dbg("starting listeners ...");
 	my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
@@ -671,7 +680,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) {
@@ -856,6 +865,7 @@ sub per_minute
 sub per_10_minute
 {
 	RBN::per_10_minute();
+	Route::write_cache();
 }
 
 sub per_hour