X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=7db7ae3c9a9ddfe57e67903bdb3f58f2ec61acdc;hb=6a0068ec3df1dca0c6ae2714af3c0a4a62998dcf;hp=76dea21912b67f81dc8a39d9c1e4da1beef62ac3;hpb=20b0104deaeab77fa7ab1444dbcedfcdbf5865f8;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 76dea219..7db7ae3c 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -12,8 +12,12 @@
 
 # make sure that modules are searched in the order local then perl
 BEGIN {
-  unshift @INC, '/spider/perl';  # this IS the right way round!
-  unshift @INC, '/spider/local';
+  # 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";
 }
 
 use Msg;
@@ -24,25 +28,28 @@ use DXUser;
 use DXM;
 use DXCommandmode;
 use DXProt;
+use DXMsg;
 use DXCluster;
 use DXDebug;
+use DXCron;
+use DXConnect;
+use Prefix;
+use Bands;
+use Geomag;
+use Carp;
 
 package main;
 
 @inqueue = ();                # the main input queue, an array of hashes
 $systime = 0;                 # the time now (in seconds)
+$version = 1.2;               # the version no of the software
 
 # handle disconnections
 sub disconnect
 {
   my $dxchan = shift;
   return if !defined $dxchan;
-  my $user = $dxchan->{user};
-  my $conn = $dxchan->{conn};
-  $dxchan->finish();
-  $user->close() if defined $user;
-  $conn->disconnect() if defined $conn;
-  $dxchan->del();
+  $dxchan->disconnect();
 }
 
 # handle incoming messages
@@ -59,17 +66,13 @@ sub rec
   # 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+)\|(.*)$/;
-     my $user = DXUser->get($call);
-	 if (!defined $user) {
-	   $user = DXUser->new($call);
-	 }
-	 my $sort = $user->sort();
-	 
-	 # is there one already connected?
+
+     # 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;
@@ -80,21 +83,20 @@ sub rec
 	   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;
      }
 
-     # set some necessary flags on the user if they are connecting
-	 $user->wwv(1) if !$user->wwv();
-	 $user->talk(1) if !$user->talk();
-	 $user->ann(1) if !$user->ann();
-	 $user->here(1) if !$user->here();
-	 $user->sort('U') if !$user->sort();
+     my $user = DXUser->get($call);
+	 if (!defined $user) {
+	   $user = DXUser->new($call);
+	 }
 
-	 # create the channel
-     $dxchan = DXCommandmode->new($call, $conn, $user) if ($sort eq 'U');
-     $dxchan = DXProt->new($call, $conn, $user) if ($sort eq 'A');
+     # 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;
   }
   
@@ -142,7 +144,10 @@ sub process_inqueue
     $dxchan->start($line);  
   } elsif ($sort eq 'D') {
     die "\$user not defined for $call" if !defined $user;
-	$dxchan->normal($line);  
+	
+	# normal input
+	$dxchan->normal($line);
+
     disconnect($dxchan) if ($dxchan->{state} eq 'bye');
   } elsif ($sort eq 'Z') {
     disconnect($dxchan);
@@ -164,10 +169,23 @@ foreach(@debug) {
 }
 STDOUT->autoflush(1);
 
+# banner
+print "DXSpider DX Cluster Version $version\nCopyright (c) 1998 Dirk Koopman G1TLH\n";
+
+# load Prefixes
+print "loading prefixes ...\n";
+Prefix::load();
+
+# load band data
+print "loading band data ...\n";
+Bands::load();
+
 # initialise User file system
+print "loading user file system ...\n"; 
 DXUser->init($userfn);
 
 # start listening for incoming messages/connects
+print "starting listener ...\n";
 Msg->new_server("$clusteraddr", $clusterport, \&login);
 
 # prime some signals
@@ -175,7 +193,28 @@ $SIG{'INT'} = \&cease;
 $SIG{'TERM'} = \&cease;
 $SIG{'HUP'} = 'IGNORE';
 
+# 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
+print "reading existing message headers\n";
+DXMsg->init();
+
+# read in any cron jobs
+print "reading cron jobs\n";
+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);
@@ -189,6 +228,8 @@ for (;;) {
 	$ztime = &ztime();
     DXCommandmode::process();     # process ongoing command mode stuff
     DXProt::process();              # process ongoing ak1a pcxx stuff
+	DXCron::process();
+	DXConnect::process();
   }
 }