X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=35881d452d88f96ee82f6516e0b59e23bdb4622e;hb=929d169b2e8d16c67fe11d97e00464707e2fb57b;hp=20e80ddbfe16f61978b8f5731431a94c2e19375f;hpb=5b0cb88ef61ecda87a29033d8fc70edc617afc62;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 20e80ddb..35881d45 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -69,6 +69,7 @@ use DXDb;
 use DXHash;
 use DXDupe;
 use Prefix;
+use Spot;
 use Bands;
 use Keps;
 use Minimuf;
@@ -81,6 +82,9 @@ use BBS;
 use WCY;
 use BadWords;
 use Timer;
+use Route;
+use Route::Node;
+use Route::User;
 
 use Data::Dumper;
 use IO::File;
@@ -94,12 +98,12 @@ package main;
 use strict;
 use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects 
 			$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr 
-			$clusterport $mycall $decease $build $is_win
+			$clusterport $mycall $decease $build $is_win $routeroot 
 		   );
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.47";				# the version no of the software
+$version = "1.48";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();				# list of listeners
@@ -109,7 +113,8 @@ $starttime = 0;                 # the starting time of the cluster
 sub already_conn
 {
 	my ($conn, $call, $mess) = @_;
-	
+
+	$conn->disable_read(1);
 	dbg('chan', "-> D $call $mess\n"); 
 	$conn->send_now("D$call|$mess");
 	sleep(2);
@@ -146,7 +151,7 @@ sub new_channel
 			;
 		} else {
 			if (my $ref = DXCluster->get_exact($call)) {
-				my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+				my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->dxchancall);
 				already_conn($conn, $call, $mess);
 				return;
 			}
@@ -154,7 +159,7 @@ sub new_channel
 		$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
 	} else {
 		if (my $ref = DXCluster->get_exact($call)) {
-			my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+			my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->dxchancall);
 			already_conn($conn, $call, $mess);
 			return;
 		}
@@ -206,8 +211,10 @@ sub cease
 {
 	my $dxchan;
 
-	$SIG{'TERM'} = 'IGNORE';
-	$SIG{'INT'} = 'IGNORE';
+	unless ($is_win) {
+		$SIG{'TERM'} = 'IGNORE';
+		$SIG{'INT'} = 'IGNORE';
+	}
 	
 	DXUser::sync;
 
@@ -217,28 +224,21 @@ sub cease
 	dbg('local', "Local::finish error $@") if $@;
 
 	# disconnect nodes
-	foreach $dxchan (DXChannel->get_all()) {
-		next unless $dxchan->is_node;
-	    $dxchan->disconnect unless $dxchan == $DXProt::me;
+	foreach $dxchan (DXChannel->get_all_nodes) {
+	    $dxchan->disconnect(2) unless $dxchan == $DXProt::me;
 	}
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
+	Msg->event_loop(100, 0.01);
 
 	# disconnect users
-	foreach $dxchan (DXChannel->get_all()) {
-		next if $dxchan->is_node;
-		$dxchan->disconnect(2) unless $dxchan == $DXProt::me;
+	foreach $dxchan (DXChannel->get_all_users) {
+		$dxchan->disconnect;
 	}
 
 	# disconnect AGW
 	AGWMsg::finish();
-	
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
+
+	# end everything else
+	Msg->event_loop(100, 0.01);
 	DXUser::finish();
 	DXDupe::finish();
 
@@ -348,6 +348,7 @@ while (<CL>) {
 }
 close CL;
 foreach my $fn (@fn) {
+	$fn =~ s|::|/|g;
 	open(CL, "$main::root/perl/${fn}.pm") or next;
 	while (<CL>) {
 		if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)/ ) {
@@ -393,11 +394,11 @@ AGWrestart();
 dbg('err', "load badwords: " . (BadWords::load or "Ok"));
 
 # prime some signals
+unless ($DB::VERSION) {
+	$SIG{INT} = $SIG{TERM} = sub { $decease = 1 };
+}
+
 unless ($is_win) {
-	unless ($DB::VERSION) {
-		$SIG{INT} = \&cease;
-		$SIG{TERM} = \&cease;
-	}
 	$SIG{HUP} = 'IGNORE';
 	$SIG{CHLD} = sub { $zombies++ };
 	
@@ -437,6 +438,7 @@ DXProt->init();
 
 # put in a DXCluster node for us here so we can add users and take them away
 DXNode->new($DXProt::me, $mycall, 0, 1, $DXProt::myprot_version); 
+$routeroot = Route::Node->new($mycall, $version, Route::here($DXProt::me->here)|Route::conf($DXProt::me->confmode));
 
 # read in any existing message headers and clean out old crap
 dbg('err', "reading existing message headers ...");