X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=2c94dcc1cb619571baef325fe4607071c453bb1c;hb=4a8336156c820698be4933a3e36513750709926d;hp=e66d45aaba898726c3dbdb788a2a305b2cf67384;hpb=0fba7d9a347ba724606738dded2f4dce633d46f5;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index e66d45aa..2c94dcc1 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -39,6 +39,8 @@ BEGIN {
 }
 
 use Msg;
+use IntMsg;
+use ExtMsg;
 use DXVars;
 use DXDebug;
 use DXLog;
@@ -81,16 +83,10 @@ $systime = 0;					# the time now (in seconds)
 $version = "1.47";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
-@outstanding_connects = ();     # list of outstanding connects
-      
-# handle disconnections
-sub disconnect
-{
-	my $dxchan = shift;
-	return if !defined $dxchan;
-	$dxchan->disconnect();
-}
+#@outstanding_connects = ();     # list of outstanding connects
+@listeners = ();				# list of listeners
 
+      
 # send a message to call on conn and disconnect
 sub already_conn
 {
@@ -102,7 +98,7 @@ sub already_conn
 	dbg('chan', "-> Z $call bye\n");
 	$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
 	sleep(1);
-	$conn->disconnect();
+	$conn->disconnect;
 }
 
 # handle incoming messages
@@ -132,8 +128,8 @@ sub rec
  
 		# is there one already connected to me - locally? 
 		my $user = DXUser->get($call);
-		if (DXChannel->get($call)) {
-			my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call);
+		if ($sort ne 'O' && Msg->conns($call)) {
+			my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call, $main::mycall);
 			already_conn($conn, $call, $mess);
 			return;
 		}
@@ -143,16 +139,16 @@ sub rec
 			if (($user->is_node || $call eq $myalias) && !DXCluster->get_exact($call)) {
 				;
 			} else {
-				if (DXCluster->get_exact($call)) {
-					my $mess = DXM::msg($lang, $user->is_node ? 'concluster' : 'conother', $call);
+				if (my $ref = DXCluster->get_exact($call)) {
+					my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
 					already_conn($conn, $call, $mess);
 					return;
 				}
 			}
 			$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
 		} else {
-			if (DXCluster->get_exact($call)) {
-				my $mess = DXM::msg($lang, 'conother', $call);
+			if (my $ref = DXCluster->get_exact($call)) {
+				my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
 				already_conn($conn, $call, $mess);
 				return;
 			}
@@ -163,9 +159,13 @@ sub rec
 		if ($user->lockout) {
 			Log('DXCommand', "$call is locked out, disconnected");
 			$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
+			$conn->disconnect;
 			return;
 		}
 
+		# mark him up
+		$conn->conns($call) unless $sort eq 'O';
+		
 		# create the channel
 		$dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
 		$dxchan = DXProt->new($call, $conn, $user) if $user->is_node;
@@ -205,19 +205,15 @@ sub cease
 	# disconnect nodes
 	foreach $dxchan (DXChannel->get_all()) {
 		next unless $dxchan->is_node;
-		disconnect($dxchan) unless $dxchan == $DXProt::me;
+	    $dxchan->disconnect unless $dxchan == $DXProt::me;
 	}
 	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);
 
 	# disconnect users
 	foreach $dxchan (DXChannel->get_all()) {
 		next if $dxchan->is_node;
-		disconnect($dxchan) unless $dxchan == $DXProt::me;
+		$dxchan->disconnect unless $dxchan == $DXProt::me;
 	}
 	Msg->event_loop(1, 0.05);
 	Msg->event_loop(1, 0.05);
@@ -230,7 +226,12 @@ sub cease
 
 	# close all databases
 	DXDb::closeall;
-	
+
+	# close all listeners
+	for (@listeners) {
+		$_->close_server;
+	}
+
 	dbg('chan', "DXSpider version $version ended");
 	Log('cluster', "DXSpider V$version stopped");
 	dbgclose();
@@ -246,7 +247,7 @@ sub reap
 	my $cpid;
 	while (($cpid = waitpid(-1, WNOHANG)) > 0) {
 		dbg('reap', "cpid: $cpid");
-		@outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
+#		Msg->pid_gone($cpid);
 		$zombies-- if $zombies > 0;
 	}
 	dbg('reap', "cpid: $cpid");
@@ -276,10 +277,10 @@ sub process_inqueue
 		die "\$user not defined for $call" if !defined $user;
 		# normal input
 		$dxchan->normal($line);
-		disconnect($dxchan) if ($dxchan->{state} eq 'bye');
+		$dxchan->disconnect if ($dxchan->{state} eq 'bye');
 	} elsif ($sort eq 'Z') {
 		$dxchan->conn(undef);
-		disconnect($dxchan);
+		$dxchan->disconnect;
 	} elsif ($sort eq 'D') {
 		;                       # ignored (an echo)
 	} else {
@@ -331,28 +332,39 @@ dbg('err', "loading user file system ...");
 DXUser->init($userfn, 1);
 
 # start listening for incoming messages/connects
-dbg('err', "starting listener ...");
-Msg->new_server("$clusteraddr", $clusterport, \&login);
+use Listeners;
+
+dbg('err', "starting listeners ...");
+push @listeners, IntMsg->new_server("$clusteraddr", $clusterport, \&login);
+dbg('err', "Internal port: $clusteraddr $clusterport");
+for (@main::listen) {
+	push @listeners, ExtMsg->new_server($_->[0], $_->[1], \&login);
+	dbg('err', "External Port: $_->[0] $_->[1]");
+}
 
 # load bad words
 dbg('err', "load badwords: " . (BadWords::load or "Ok"));
 
 # prime some signals
-$SIG{INT} = \&cease;
-$SIG{TERM} = \&cease;
-$SIG{HUP} = 'IGNORE';
-$SIG{CHLD} = sub { $zombies++ };
-
-$SIG{PIPE} = sub { 	dbg('err', "Broken PIPE signal received"); };
-$SIG{IO} = sub { 	dbg('err', "SIGIO received"); };
-$SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE';
-$SIG{KILL} = 'DEFAULT';     # as if it matters....
-
-# catch the rest with a hopeful message
-for (keys %SIG) {
-	if (!$SIG{$_}) {
-#		dbg('chan', "Catching SIG $_");
-		$SIG{$_} = sub { my $sig = shift;	DXDebug::confess("Caught signal $sig");  }; 
+unless ($^O =~ /^MS/) {
+	unless ($DB::VERSION) {
+		$SIG{INT} = \&cease;
+		$SIG{TERM} = \&cease;
+	}
+	$SIG{HUP} = 'IGNORE';
+	$SIG{CHLD} = sub { $zombies++ };
+	
+	$SIG{PIPE} = sub { 	dbg('err', "Broken PIPE signal received"); };
+	$SIG{IO} = sub { 	dbg('err', "SIGIO received"); };
+	$SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE';
+	$SIG{KILL} = 'DEFAULT';     # as if it matters....
+
+	# catch the rest with a hopeful message
+	for (keys %SIG) {
+		if (!$SIG{$_}) {
+			#		dbg('chan', "Catching SIG $_");
+			$SIG{$_} = sub { my $sig = shift;	DXDebug::confess("Caught signal $sig");  }; 
+		}
 	}
 }