X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=aa95e7ac680df8c1f16ca30992312c6c69083da3;hb=60d889442d24ab5567fe0b6c9bb923f4297a07bd;hp=54295e4b7beaaec871a50d39187319f5ffd6aeaf;hpb=f4bc6091a243be2891148902d41e921e171e1a44;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 54295e4b..aa95e7ac 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
-	$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,10 +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 Msg;
 use DXVars;
+use Msg;
+use IntMsg;
+use Internet;
+use Listeners;
+use ExtMsg;
+use AGWConnect;
+use AGWMsg;
 use DXDebug;
 use DXLog;
 use DXLogPrint;
@@ -48,116 +57,131 @@ 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 Local;
-use DXDb;
-use Data::Dumper;
+use AnnTalk;
+use BBS;
+use WCY;
+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";
 
-use Carp qw(cluck);
+use Local;
 
 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 $is_win $routeroot 
+		   );
+
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.40";				# 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
-      
-# handle disconnections
-sub disconnect
-{
-	my $dxchan = shift;
-	return if !defined $dxchan;
-	$dxchan->disconnect();
-}
+#@outstanding_connects = ();     # list of outstanding connects
+@listeners = ();				# list of listeners
 
+use vars qw($VERSION $BRANCH $build $branch);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += 15;				# add an offset to make it bigger than last system
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
+      
 # send a message to call on conn and disconnect
 sub already_conn
 {
 	my ($conn, $call, $mess) = @_;
-	
-	dbg('chan', "-> D $call $mess\n"); 
+
+	$conn->disable_read(1);
+	dbg("-> D $call $mess\n") if isdbg('chan'); 
 	$conn->send_now("D$call|$mess");
-	sleep(1);
-	dbg('chan', "-> Z $call bye\n");
-	$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
-	sleep(1);
-	$conn->disconnect();
+	sleep(2);
+	$conn->disconnect;
+}
+
+sub error_handler
+{
+	my $dxchan = shift;
+	$dxchan->{conn}->set_error(undef) if exists $dxchan->{conn};
+	$dxchan->disconnect(1);
 }
 
 # handle incoming messages
-sub rec
+sub new_channel
 {
-	my ($conn, $msg, $err) = @_;
-	my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
+	my ($conn, $msg) = @_;
+	my ($sort, $call, $line) = DXChannel::decode_input(0, $msg);
+	return unless defined $sort;
 	
-	if (!defined $msg || (defined $err && $err)) {
-		if ($dxchan) {
-			$dxchan->disconnect;
-		} elsif ($conn) {
-			$conn->disconnect;
-		}
+	# set up the basic channel info
+	# 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;
 	}
 	
-	# set up the basic channel info - this needs a bit more thought - there is duplication here
-	if (!defined $dxchan) {
-		my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
- 
-		# is there one already connected to me - locally? 
-		my $user = DXUser->get($call);
-		if (DXChannel->get($call)) {
-			my $mess = DXM::msg($lang, ($user && $user->sort eq 'A') ? 'concluster' : 'conother', $call);
-			already_conn($conn, $call, $mess);
-			return;
-		}
-		
-		# is there one already connected elsewhere in the cluster?
-		if ($user) {
-			if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
-				;
-			} else {
-				if (DXCluster->get_exact($call)) {
-					my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $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);
-				already_conn($conn, $call, $mess);
-				return;
-			}
-			$user = DXUser->new($call);
-		}
+	if ($user) {
+		$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
+	} else {
+		$user = DXUser->new($call);
+	}
+	
+	# is he locked out ?
+	if ($user->lockout) {
+		Log('DXCommand', "$call is locked out, disconnected");
+		$conn->disconnect;
+		return;
+	}
 
-		# is he locked out ?
-		if ($user->lockout) {
-			Log('DXCommand', "$call is locked out, disconnected");
-			$conn->send_now("Z$call|bye"); # this will cause 'client' to 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;
 
-		# create the channel
-		$dxchan = DXCommandmode->new($call, $conn, $user) if ($user->sort eq 'U');
-		$dxchan = DXProt->new($call, $conn, $user) if ($user->sort eq 'A');
-		$dxchan = BBS->new($call, $conn, $user) if ($user->sort eq 'B');
-		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) {
@@ -170,7 +194,7 @@ sub rec
 
 sub login
 {
-	return \&rec;
+	return \&new_channel;
 }
 
 # cease running this program, close down all the connections nicely
@@ -178,44 +202,47 @@ sub cease
 {
 	my $dxchan;
 
-	$SIG{'TERM'} = 'IGNORE';
-	$SIG{'INT'} = 'IGNORE';
+	unless ($is_win) {
+		$SIG{'TERM'} = 'IGNORE';
+		$SIG{'INT'} = 'IGNORE';
+	}
 	
+	DXUser::sync;
+
 	eval {
 		Local::finish();   # end local processing
 	};
-	dbg('local', "Local::finish error $@") if $@;
+	dbg("Local::finish error $@") if $@;
 
 	# disconnect nodes
-	foreach $dxchan (DXChannel->get_all()) {
-		next unless $dxchan->is_ak1a;
-		disconnect($dxchan) 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(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	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_ak1a;
-		disconnect($dxchan) 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();
 
 	# close all databases
 	DXDb::closeall;
-	
-	dbg('chan', "DXSpider version $version ended");
-	Log('cluster', "DXSpider V$version stopped");
+
+	# close all listeners
+	foreach my $l (@listeners) {
+		$l->close_server;
+	}
+
+	dbg("DXSpider version $version, build $build ended") if isdbg('chan');
+	Log('cluster', "DXSpider V$version, build $build ended");
 	dbgclose();
 	Logclose();
 	unlink $lockfn;
@@ -226,50 +253,50 @@ sub cease
 # the reaper of children
 sub reap
 {
-	$SIG{'CHLD'} = \&reap;
-	my $cpid = wait;
-	@outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
+	my $cpid;
+	while (($cpid = waitpid(-1, WNOHANG)) > 0) {
+		dbg("cpid: $cpid") if isdbg('reap');
+#		Msg->pid_gone($cpid);
+		$zombies-- if $zombies > 0;
+	}
+	dbg("cpid: $cpid") if isdbg('reap');
 }
 
 # this is where the input queue is dealt with and things are dispatched off to other parts of
 # the cluster
 sub process_inqueue
 {
-	my $self = shift @inqueue;
-	return if !$self;
-	
-	my $data = $self->{data};
-	my $dxchan = $self->{dxchan};
-	my ($sort, $call, $line) = $data =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
-	my $error;
+	while (@inqueue) {
+		my $self = shift @inqueue;
+		return if !$self;
 	
-	# the above regexp must work
-	return unless ($sort && $call && $line);
-	
-	# translate any crappy characters into hex characters 
-	if ($line =~ /[\x00-\x06\x08\x0a-\x1f\x7f-\xff]/o) {
-		$line =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
-	}
+		my $data = $self->{data};
+		my $dxchan = $self->{dxchan};
+		my $error;
+		my ($sort, $call, $line) = DXChannel::decode_input($dxchan, $data);
+		return unless defined $sort;
 	
-	# do the really sexy console interface bit! (Who is going to do the TK interface then?)
-	dbg('chan', "<- $sort $call $line\n") unless $sort eq 'D';
-
-	# handle A records
-	my $user = $dxchan->user;
-	if ($sort eq 'A' || $sort eq 'O') {
-		$dxchan->start($line, $sort);  
-	} elsif ($sort eq 'I') {
-		die "\$user not defined for $call" if !defined $user;
-		# normal input
-		$dxchan->normal($line);
-		disconnect($dxchan) if ($dxchan->{state} eq 'bye');
-	} elsif ($sort eq 'Z') {
-		$dxchan->conn(undef);
-		disconnect($dxchan);
-	} elsif ($sort eq 'D') {
-		;                       # ignored (an echo)
-	} else {
-		print STDERR atime, " Unknown command letter ($sort) received from $call\n";
+		# do the really sexy console interface bit! (Who is going to do the TK interface then?)
+		dbg("<- $sort $call $line\n") if $sort ne 'D' && isdbg('chan');
+
+		# handle A records
+		my $user = $dxchan->user;
+		if ($sort eq 'A' || $sort eq 'O') {
+			$dxchan->start($line, $sort);  
+		} elsif ($sort eq 'I') {
+			die "\$user not defined for $call" if !defined $user;
+			# normal input
+			$dxchan->normal($line);
+			$dxchan->disconnect if ($dxchan->{state} eq 'bye');
+		} elsif ($sort eq 'Z') {
+			$dxchan->disconnect;
+		} elsif ($sort eq 'D') {
+			;					# ignored (an echo)
+		} elsif ($sort eq 'G') {
+			$dxchan->enhanced($line);
+		} else {
+			print STDERR atime, " Unknown command letter ($sort) received from $call\n";
+		}
 	}
 }
 
@@ -283,6 +310,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 
@@ -290,40 +323,79 @@ sub uptime
 #############################################################
 
 $starttime = $systime = time;
+$lang = 'en' unless $lang;
 
 # open the debug file, set various FHs to be unbuffered
-dbginit();
+dbginit(\&DXCommandmode::broadcast_debug);
 foreach (@debug) {
 	dbgadd($_);
 }
 STDOUT->autoflush(1);
 
-Log('cluster', "DXSpider V$version started");
+# calculate build number
+$build += $main::version;
+$build = "$build.$branch" if $branch;
+
+Log('cluster', "DXSpider V$version, build $build started");
 
 # banner
-print "DXSpider DX Cluster Version $version\nCopyright (c) 1998-1999 Dirk Koopman G1TLH\n";
+dbg("Copyright (c) 1998-2001 Dirk Koopman G1TLH");
+dbg("DXSpider Version $version, build $build started");
 
 # load Prefixes
-print "loading prefixes ...\n";
+dbg("loading prefixes ...");
 Prefix::load();
 
 # load band data
-print "loading band data ...\n";
+dbg("loading band data ...");
 Bands::load();
 
 # initialise User file system
-print "loading user file system ...\n"; 
+dbg("loading user file system ..."); 
 DXUser->init($userfn, 1);
 
 # start listening for incoming messages/connects
-print "starting listener ...\n";
-Msg->new_server("$clusteraddr", $clusterport, \&login);
+dbg("starting listeners ...");
+my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
+$conn->conns("Server $clusteraddr/$clusterport");
+push @listeners, $conn;
+dbg("Internal port: $clusteraddr $clusterport");
+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("External Port: $l->[0] $l->[1]");
+}
+AGWrestart();
+
+# load bad words
+dbg("load badwords: " . (BadWords::load or "Ok"));
 
 # prime some signals
-$SIG{'INT'} = \&cease;
-$SIG{'TERM'} = \&cease;
-$SIG{'HUP'} = 'IGNORE';
-$SIG{'CHLD'} = \&reap;
+unless ($DB::VERSION) {
+	$SIG{INT} = $SIG{TERM} = sub { $decease = 1 };
+}
+
+unless ($is_win) {
+	$SIG{HUP} = 'IGNORE';
+	$SIG{CHLD} = sub { $zombies++ };
+	
+	$SIG{PIPE} = sub { 	dbg("Broken PIPE signal received"); };
+	$SIG{IO} = sub { 	dbg("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("Catching SIG $_") if isdbg('chan');
+			$SIG{$_} = sub { my $sig = shift;	DXDebug::confess("Caught signal $sig");  }; 
+		}
+	}
+}
+
+# start dupe system
+DXDupe::init();
 
 # read in system messages
 DXM->init();
@@ -333,71 +405,81 @@ CmdAlias->init();
 
 # initialise the Geomagnetic data engine
 Geomag->init();
+WCY->init();
 
 # initial the Spot stuff
 Spot->init();
 
 # initialise the protocol engine
-print "reading in duplicate spot and WWV info ...\n";
+dbg("reading in duplicate spot and WWV info ...");
 DXProt->init();
 
-
 # put in a DXCluster node for us here so we can add users and take them away
-DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version); 
+$routeroot = Route::Node->new($mycall, $version*100+5300, Route::here($DXProt::me->here)|Route::conf($DXProt::me->conf));
+
+# make sure that there is a routing OUTPUT node default file
+#unless (Filter::read_in('route', 'node_default', 0)) {
+#	my $dxcc = $DXProt::me->dxcc;
+#	$Route::filterdef->cmd($DXProt::me, 'route', 'accept', "node_default call $mycall" );
+#}
 
 # read in any existing message headers and clean out old crap
-print "reading existing message headers ...\n";
+dbg("reading existing message headers ...");
 DXMsg->init();
 DXMsg::clean_old();
 
 # read in any cron jobs
-print "reading cron jobs ...\n";
+dbg("reading cron jobs ...");
 DXCron->init();
 
 # read in database descriptors
-print "reading database descriptors ...\n";
+dbg("reading database descriptors ...");
 DXDb::load();
 
 # starting local stuff
-print "doing local initialisation ...\n";
+dbg("doing local initialisation ...");
 eval {
 	Local::init();
 };
-dbg('local', "Local::init error $@") if $@;
+dbg("Local::init error $@") if $@;
+
+dbg("cleaning out old debug files");
+DXDebug::dbgclean();
 
 # print various flags
-#print "useful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P\n";
+#dbg("seful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P");
 
 # this, such as it is, is the main loop!
-print "orft we jolly well go ...\n";
-dbg('chan', "DXSpider version $version started...");
+dbg("orft we jolly well go ...");
 
-open(DB::OUT, "|tee /tmp/aa");
+#open(DB::OUT, "|tee /tmp/aa");
 
 for (;;) {
-	my $timenow;
-	$DB::trace = 1;
+#	$DB::trace = 1;
 	
-	Msg->event_loop(1, 0.1);
-	$timenow = time;
+	Msg->event_loop(10, 0.010);
+	my $timenow = time;
 	process_inqueue();			# read in lines from the input queue and despatch them
-	$DB::trace = 0;
+#	$DB::trace = 0;
 	
 	# do timed stuff, ongoing processing happens one a second
 	if ($timenow != $systime) {
+		reap if $zombies;
 		$systime = $timenow;
-		$cldate = &cldate();
-		$ztime = &ztime();
 		DXCron::process();      # do cron jobs
 		DXCommandmode::process(); # process ongoing command mode stuff
 		DXProt::process();		# process ongoing ak1a pcxx stuff
 		DXConnect::process();
 		DXMsg::process();
 		DXDb::process();
+		DXUser::process();
+		DXDupe::process();
+		AGWMsg::process();
+				
 		eval { 
 			Local::process();       # do any localised processing
 		};
-		dbg('local', "Local::process error $@") if $@;
+		dbg("Local::process error $@") if $@;
 	}
 	if ($decease) {
 		last if --$decease <= 0;