X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=35881d452d88f96ee82f6516e0b59e23bdb4622e;hb=b1de8d406cf0b76292d401c4b75f33fca86a822d;hp=eef7a40cd02d4fa5c970517192c35d3aba9aa689;hpb=586cbb347e7639f5575b48572e75140501a109c0;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index eef7a40c..35881d45 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -25,7 +25,7 @@ BEGIN {
 
 	# try to create and lock a lockfile (this isn't atomic but 
 	# should do for now
-	my $lockfn = "$root/perl/cluster.lock";       # lock file name
+	$lockfn = "$root/perl/cluster.lck";       # lock file name
 	if (-e $lockfn) {
 		open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 		my $pid = <CLLOCK>;
@@ -36,12 +36,19 @@ BEGIN {
 	open(CLLOCK, ">$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 	print CLLOCK "$$\n";
 	close CLLOCK;
+
+	$is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
+	$systime = time;
 }
 
+use DXVars;
 use Msg;
 use IntMsg;
+use Internet;
+use Listeners;
 use ExtMsg;
-use DXVars;
+use AGWConnect;
+use AGWMsg;
 use DXDebug;
 use DXLog;
 use DXLogPrint;
@@ -50,23 +57,37 @@ use DXChannel;
 use DXUser;
 use DXM;
 use DXCommandmode;
+use DXProtVars;
+use DXProtout;
 use DXProt;
 use DXMsg;
 use DXCluster;
 use DXCron;
 use DXConnect;
+use DXBearing;
+use DXDb;
+use DXHash;
+use DXDupe;
 use Prefix;
+use Spot;
 use Bands;
+use Keps;
+use Minimuf;
+use Sun;
 use Geomag;
 use CmdAlias;
 use Filter;
-use DXDb;
 use AnnTalk;
+use BBS;
 use WCY;
-use DXDupe;
 use BadWords;
+use Timer;
+use Route;
+use Route::Node;
+use Route::User;
 
 use Data::Dumper;
+use IO::File;
 use Fcntl ':flock'; 
 use POSIX ":sys_wait_h";
 
@@ -74,15 +95,16 @@ use Local;
 
 package main;
 
-#use strict;
-#use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects $zombies $root
-#		   $lang $myalias @debug $userfn $clusteraddr $clusterport $mycall $decease );
+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 $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   
-$lockfn = "cluster.lock";       # lock file name
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();				# list of listeners
 
@@ -91,7 +113,8 @@ $lockfn = "cluster.lock";       # lock file name
 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);
@@ -101,67 +124,74 @@ sub already_conn
 sub error_handler
 {
 	my $dxchan = shift;
-	$dxchan->disconnect;
+	$dxchan->{conn}->set_error(undef) if exists $dxchan->{conn};
+	$dxchan->disconnect(1);
 }
 
 # handle incoming messages
-sub rec
+sub new_channel
 {
 	my ($conn, $msg) = @_;
-	my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
 	my ($sort, $call, $line) = DXChannel::decode_input(0, $msg);
 	return unless defined $sort;
 	
 	# set up the basic channel info
-	if (!defined $dxchan) {
-
-		# is there one already connected to me - locally? 
-		my $user = DXUser->get($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;
-		}
-		
-		# is there one already connected elsewhere in the cluster?
-		if ($user) {
-			if (($user->is_node || $call eq $myalias) && !DXCluster->get_exact($call)) {
-				;
-			} else {
-				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
+	# is there one already connected to me - locally? 
+	my $user = DXUser->get($call);
+	my $dxchan = DXChannel->get($call);
+	if ($dxchan) {
+		my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call, $main::mycall);
+		already_conn($conn, $call, $mess);
+		return;
+	}
+	
+	# is there one already connected elsewhere in the cluster?
+	if ($user) {
+		if (($user->is_node || $call eq $myalias) && !DXCluster->get_exact($call)) {
+			;
 		} 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;
 			}
-			$user = DXUser->new($call);
 		}
-
-		# is he locked out ?
-		if ($user->lockout) {
-			Log('DXCommand', "$call is locked out, disconnected");
-			$conn->disconnect;
+		$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->dxchancall);
+			already_conn($conn, $call, $mess);
 			return;
 		}
-
-		# mark him up
-		$conn->conns($call) unless $sort eq 'O';
-		$conn->set_error(sub {error_handler($dxchan)});
-		
-		# create the channel
-		$dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
-		$dxchan = DXProt->new($call, $conn, $user) if $user->is_node;
-		$dxchan = BBS->new($call, $conn, $user) if $user->is_bbs;
-		die "Invalid sort of user on $call = $sort" if !$dxchan;
+		$user = DXUser->new($call);
 	}
 	
+	# is he locked out ?
+	if ($user->lockout) {
+		Log('DXCommand', "$call is locked out, disconnected");
+		$conn->disconnect;
+		return;
+	}
+
+	# create the channel
+	$dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
+	$dxchan = DXProt->new($call, $conn, $user) if $user->is_node;
+	$dxchan = BBS->new($call, $conn, $user) if $user->is_bbs;
+	die "Invalid sort of user on $call = $sort" if !$dxchan;
+
+	# check that the conn has a callsign
+	$conn->conns($call) if $conn->isa('IntMsg');
+
+	# set callbacks
+	$conn->set_error(sub {error_handler($dxchan)});
+	$conn->set_rproc(sub {my ($conn,$msg) = @_; rec($dxchan, $conn, $msg);});
+	rec($dxchan, $conn, $msg);
+}
+
+sub rec	
+{
+	my ($dxchan, $conn, $msg) = @_;
+	
 	# queue the message and the channel object for later processing
 	if (defined $msg) {
 		my $self = bless {}, "inqueue";
@@ -173,7 +203,7 @@ sub rec
 
 sub login
 {
-	return \&rec;
+	return \&new_channel;
 }
 
 # cease running this program, close down all the connections nicely
@@ -181,8 +211,10 @@ sub cease
 {
 	my $dxchan;
 
-	$SIG{'TERM'} = 'IGNORE';
-	$SIG{'INT'} = 'IGNORE';
+	unless ($is_win) {
+		$SIG{'TERM'} = 'IGNORE';
+		$SIG{'INT'} = 'IGNORE';
+	}
 	
 	DXUser::sync;
 
@@ -192,24 +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 unless $dxchan == $DXProt::me;
+	foreach $dxchan (DXChannel->get_all_users) {
+		$dxchan->disconnect;
 	}
-	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 AGW
+	AGWMsg::finish();
+
+	# end everything else
+	Msg->event_loop(100, 0.01);
 	DXUser::finish();
 	DXDupe::finish();
 
@@ -217,12 +246,12 @@ sub cease
 	DXDb::closeall;
 
 	# close all listeners
-	for (@listeners) {
-		$_->close_server;
+	foreach my $l (@listeners) {
+		$l->close_server;
 	}
 
-	dbg('chan', "DXSpider version $version ended");
-	Log('cluster', "DXSpider V$version stopped");
+	dbg('chan', "DXSpider version $version, build $build ended");
+	Log('cluster', "DXSpider V$version, build $build ended");
 	dbgclose();
 	Logclose();
 	unlink $lockfn;
@@ -268,7 +297,6 @@ sub process_inqueue
 		$dxchan->normal($line);
 		$dxchan->disconnect if ($dxchan->{state} eq 'bye');
 	} elsif ($sort eq 'Z') {
-		$dxchan->conn(undef);
 		$dxchan->disconnect;
 	} elsif ($sort eq 'D') {
 		;                       # ignored (an echo)
@@ -287,6 +315,12 @@ sub uptime
 	my $mins = int $t / 60;
 	return sprintf "%d %02d:%02d", $days, $hours, $mins;
 }
+
+sub AGWrestart
+{
+	AGWMsg::init(\&new_channel);
+}
+
 #############################################################
 #
 # The start of the main line of code 
@@ -303,10 +337,32 @@ foreach (@debug) {
 }
 STDOUT->autoflush(1);
 
-Log('cluster', "DXSpider V$version started");
+# calculate build number
+$build = $main::version;
+
+my @fn;
+open(CL, "$main::root/perl/cluster.pl") or die "Cannot open cluster.pl $!";
+while (<CL>) {
+	next unless /^use\s+([\w:_]+)/;
+	push @fn, $1;
+}
+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+)/ ) {
+			$build += $1;
+			last;
+		}
+	}
+	close CL;
+}
+
+Log('cluster', "DXSpider V$version, build $build started");
 
 # banner
-dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-2001 Dirk Koopman G1TLH");
+dbg('err', "DXSpider Version $version, build $build started", "Copyright (c) 1998-2001 Dirk Koopman G1TLH");
 
 # load Prefixes
 dbg('err', "loading prefixes ...");
@@ -321,29 +377,28 @@ dbg('err', "loading user file system ...");
 DXUser->init($userfn, 1);
 
 # start listening for incoming messages/connects
-use Listeners;
-
 dbg('err', "starting listeners ...");
 my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
 $conn->conns("Server $clusteraddr/$clusterport");
 push @listeners, $conn;
 dbg('err', "Internal port: $clusteraddr $clusterport");
-for (@main::listen) {
-	$conn = ExtMsg->new_server($_->[0], $_->[1], \&login);
-	$conn->conns("Server $_->[0]/$_->[1]");
+foreach my $l (@main::listen) {
+	$conn = ExtMsg->new_server($l->[0], $l->[1], \&login);
+	$conn->conns("Server $l->[0]/$l->[1]");
 	push @listeners, $conn;
-	dbg('err', "External Port: $_->[0] $_->[1]");
+	dbg('err', "External Port: $l->[0] $l->[1]");
 }
+AGWrestart();
 
 # load bad words
 dbg('err', "load badwords: " . (BadWords::load or "Ok"));
 
 # prime some signals
-unless ($^O =~ /^MS/) {
-	unless ($DB::VERSION) {
-		$SIG{INT} = \&cease;
-		$SIG{TERM} = \&cease;
-	}
+unless ($DB::VERSION) {
+	$SIG{INT} = $SIG{TERM} = sub { $decease = 1 };
+}
+
+unless ($is_win) {
 	$SIG{HUP} = 'IGNORE';
 	$SIG{CHLD} = sub { $zombies++ };
 	
@@ -383,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 ...");
@@ -415,7 +471,7 @@ dbg('err', "orft we jolly well go ...");
 for (;;) {
 #	$DB::trace = 1;
 	
-	Msg->event_loop(10, 0.001);
+	Msg->event_loop(10, 0.010);
 	my $timenow = time;
 	process_inqueue();			# read in lines from the input queue and despatch them
 #	$DB::trace = 0;
@@ -432,7 +488,8 @@ for (;;) {
 		DXDb::process();
 		DXUser::process();
 		DXDupe::process();
-		
+		AGWMsg::process();
+				
 		eval { 
 			Local::process();       # do any localised processing
 		};