X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=1eb8207806716033fbb16e9014b7e4fa9fd68d21;hb=f91e843bd91e37a969d0be7e1168649b076e5170;hp=5b3f64668cf2f10cd6a0c8238f6f78e7dc34a5f7;hpb=57b5e464bc44ae8eee23ab94c1f499f527595dc9;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 5b3f6466..1eb82078 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -12,16 +12,22 @@
 
 # make sure that modules are searched in the order local then perl
 BEGIN {
-  # root of directory tree for this system
-  $root = "/spider"; 
-  $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
+	# root of directory tree for this system
+	$root = "/spider"; 
+	$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
+	
+	unshift @INC, "$root/perl";	# this IS the right way round!
+	unshift @INC, "$root/local";
 
-  unshift @INC, "$root/perl";  # this IS the right way round!
-  unshift @INC, "$root/local";
+#	require Exporter;
+#	$Exporter::Verbose = 1;
 }
 
 use Msg;
 use DXVars;
+use DXDebug;
+use DXLog;
+use DXLogPrint;
 use DXUtil;
 use DXChannel;
 use DXUser;
@@ -30,144 +36,174 @@ use DXCommandmode;
 use DXProt;
 use DXMsg;
 use DXCluster;
-use DXDebug;
 use DXCron;
 use DXConnect;
 use Prefix;
 use Bands;
+use Geomag;
+use CmdAlias;
 use Carp;
 
 package main;
 
-@inqueue = ();                # the main input queue, an array of hashes
-$systime = 0;                 # the time now (in seconds)
-$version = 1.1;               # the version no of the software
-
+@inqueue = ();					# the main input queue, an array of hashes
+$systime = 0;					# the time now (in seconds)
+$version = 1.9;					# the version no of the software
+$starttime = 0;                 # the starting time of the cluster   
+ 
 # handle disconnections
 sub disconnect
 {
-  my $dxchan = shift;
-  return if !defined $dxchan;
-  $dxchan->disconnect();
+	my $dxchan = shift;
+	return if !defined $dxchan;
+	$dxchan->disconnect();
 }
 
 # handle incoming messages
 sub rec
 {
-  my ($conn, $msg, $err) = @_;
-  my $dxchan = DXChannel->get_by_cnum($conn);      # get the dxconnnect object for this message
-  
-  if (defined $err && $err) {
-    disconnect($dxchan) if defined $dxchan;
-	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?
-	 if (DXChannel->get($call)) {
-	   my $mess = DXM::msg('conother', $call);
-	   dbg('chan', "-> D $call $mess\n"); 
-       $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
-	   return;
-     }
-
-	 # is there one already connected elsewhere in the cluster?
-	 if (DXCluster->get($call)) {
-	   my $mess = DXM::msg('concluster', $call);
-	   dbg('chan', "-> D $call $mess\n"); 
-       $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
-	   return;
-     }
-
-     my $user = DXUser->get($call);
-	 if (!defined $user) {
-	   $user = DXUser->new($call);
-	 }
-
-     # 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');
-	 die "Invalid sort of user on $call = $sort" if !$dxchan;
-  }
-  
-  # queue the message and the channel object for later processing
-  if (defined $msg) {
-    my $self = bless {}, "inqueue";
-    $self->{dxchan} = $dxchan;
-    $self->{data} = $msg;
-	push @inqueue, $self;
-  }
+	my ($conn, $msg, $err) = @_;
+	my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
+	
+	if (defined $err && $err) {
+		disconnect($dxchan) if defined $dxchan;
+		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?
+		if (DXChannel->get($call)) {
+			my $mess = DXM::msg($lang, 'conother', $call);
+			dbg('chan', "-> D $call $mess\n"); 
+			$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
+			return;
+		}
+		
+		# is there one already connected elsewhere in the cluster (and not a cluster)
+		my $user = DXUser->get($call);
+		if ($user && $user->sort eq 'A' && !DXCluster->get_exact($call)) {
+			;
+		} elsif (($call eq $main::myalias && DXCluster->get_exact($call)) ||
+		    DXCluster->get($call)) {
+			my $mess = DXM::msg($lang, 'concluster', $call);
+			dbg('chan', "-> D $call $mess\n"); 
+			$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
+			return;
+		}
+		
+		# the user MAY have an SSID if local, but otherwise doesn't
+		my $user = DXUser->get($call);
+		if (!defined $user) {
+			$user = DXUser->new($call);
+		} else {
+			$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
+		}
+		
+		
+		# 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');
+		die "Invalid sort of user on $call = $sort" if !$dxchan;
+	}
+	
+	# queue the message and the channel object for later processing
+	if (defined $msg) {
+		my $self = bless {}, "inqueue";
+		$self->{dxchan} = $dxchan;
+		$self->{data} = $msg;
+		push @inqueue, $self;
+	}
 }
 
 sub login
 {
-  return \&rec;
+	return \&rec;
 }
 
 # cease running this program, close down all the connections nicely
 sub cease
 {
-  my $dxchan;
-  foreach $dxchan (DXChannel->get_all()) {
-    disconnect($dxchan);
-  }
-  exit(0);
+	my $dxchan;
+	foreach $dxchan (DXChannel->get_all()) {
+		disconnect($dxchan);
+	}
+	Log('cluster', "DXSpider V$version stopped");
+	exit(0);
+}
+
+# the reaper of children
+sub reap
+{
+	my $cpid = wait;
 }
 
 # 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)(\S+)\|(.*)$/;
-  
-  # do the really sexy console interface bit! (Who is going to do the TK interface then?)
-  dbg('chan', "<- $sort $call $line\n");
-  
-  # handle A records
-  my $user = $dxchan->user;
-  if ($sort eq 'A') {
-    $dxchan->start($line);  
-  } elsif ($sort eq 'D') {
-    die "\$user not defined for $call" if !defined $user;
+	my $self = shift @inqueue;
+	return if !$self;
+	
+	my $data = $self->{data};
+	my $dxchan = $self->{dxchan};
+	my ($sort, $call, $line) = $data =~ /^(\w)(\S+)\|(.*)$/;
 	
-	# normal input
-	$dxchan->normal($line);
-
-    disconnect($dxchan) if ($dxchan->{state} eq 'bye');
-  } elsif ($sort eq 'Z') {
-    disconnect($dxchan);
-  } 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('chan', "<- $sort $call $line\n");
+	
+	# handle A records
+	my $user = $dxchan->user;
+	if ($sort eq 'A' || $sort eq 'O') {
+		$dxchan->start($line, $sort);  
+	} elsif ($sort eq 'D') {
+		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') {
+		disconnect($dxchan);
+	} else {
+		print STDERR atime, " Unknown command letter ($sort) received from $call\n";
+	}
 }
 
+sub uptime
+{
+	my $t = $systime - $starttime;
+	my $days = int $t / 86400;
+	$t -= $days * 86400;
+	my $hours = int $t / 3600;
+	$t -= $hours * 3600;
+	my $mins = int $t / 60;
+	return sprintf "%d %02d:%02d", $days, $hours, $mins;
+}
 #############################################################
 #
 # The start of the main line of code 
 #
 #############################################################
 
+$starttime = $systime = time;
+
 # open the debug file, set various FHs to be unbuffered
-dbginit($debugfn);
-foreach(@debug) {
-  dbgadd($_);
+foreach (@debug) {
+	dbgadd($_);
 }
 STDOUT->autoflush(1);
 
+Log('cluster', "DXSpider V$version started");
+
 # banner
 print "DXSpider DX Cluster Version $version\nCopyright (c) 1998 Dirk Koopman G1TLH\n";
 
@@ -191,16 +227,30 @@ Msg->new_server("$clusteraddr", $clusterport, \&login);
 $SIG{'INT'} = \&cease;
 $SIG{'TERM'} = \&cease;
 $SIG{'HUP'} = 'IGNORE';
+$SIG{'CHLD'} = \&reap;
+
+# read in system messages
+DXM->init();
+
+# read in command aliases
+CmdAlias->init();
 
 # initialise the protocol engine
 DXProt->init();
 
+# initialise the Geomagnetic data engine
+Geomag->init();
+
+# initial the Spot stuff
+Spot->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); 
 
-# read in any existing message headers
+# read in any existing message headers and clean out old crap
 print "reading existing message headers\n";
 DXMsg->init();
+DXMsg::clean_old();
 
 # read in any cron jobs
 print "reading cron jobs\n";
@@ -209,20 +259,24 @@ DXCron->init();
 # this, such as it is, is the main loop!
 print "orft we jolly well go ...\n";
 for (;;) {
-  my $timenow;
-  Msg->event_loop(1, 0.001);
-  $timenow = time;
-  process_inqueue();                 # read in lines from the input queue and despatch them
-
-  # do timed stuff, ongoing processing happens one a second
-  if ($timenow != $systime) {
-    $systime = $timenow;
-	$cldate = &cldate();
-	$ztime = &ztime();
-    DXCommandmode::process();     # process ongoing command mode stuff
-    DXProt::process();              # process ongoing ak1a pcxx stuff
-	DXCron::process();
-	DXConnect::process();
-  }
+	my $timenow;
+	Msg->event_loop(1, 0.001);
+	$timenow = time;
+	process_inqueue();			# read in lines from the input queue and despatch them
+	
+	# do timed stuff, ongoing processing happens one a second
+	if ($timenow != $systime) {
+		$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();
+	}
+	if ($decease) {
+		last if --$decease <= 0;
+	}
 }
 
+