added a first pass at receiving mail and files. It seems to work.

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 435d00873768fce04a968f74434151a40aa09c15..f46ef82d80f20f7ad4f7ef3d19d2685f1ce101ae 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -1,17 +1,25 @@
 #!/usr/bin/perl
 #
-# A thing that implements dxcluster 'protocol'
+# This is the DX cluster 'daemon'. It sits in the middle of its little
+# web of client routines sucking and blowing data where it may.
 #
-# This is a perl module/program that sits on the end of a dxcluster
-# 'protocol' connection and deals with anything that might come along.
-#
-# this program is called by ax25d and gets raw ax25 text on its input
+# Hence the name of 'spider' (although it may become 'dxspider')
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
 # $Id$
 # 
 
+# 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'};
+
+  unshift @INC, '$root/perl';  # this IS the right way round!
+  unshift @INC, '$root/local';
+}
+
 use Msg;
 use DXVars;
 use DXUtil;
@@ -20,25 +28,24 @@ use DXUser;
 use DXM;
 use DXCommandmode;
 use DXProt;
+use DXMsg;
 use DXCluster;
 use DXDebug;
+use Prefix;
+use Bands;
 
 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
 
 # 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
@@ -55,16 +62,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);
-        $user = DXUser->new($call) if !defined $user;
-        $user->sort('U') if (!$user->sort());
-        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;
@@ -75,14 +79,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;
      }
 
-        # create the channel
-     $dxchan = DXCommandmode->new($call, $conn, $user) if ($sort eq 'U');
-     $dxchan = DXProt->new($call, $conn, $user) if ($sort eq 'A');
+     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;
   }
   
@@ -152,10 +162,20 @@ foreach(@debug) {
 }
 STDOUT->autoflush(1);
 
+# 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
@@ -163,18 +183,27 @@ $SIG{'INT'} = \&cease;
 $SIG{'TERM'} = \&cease;
 $SIG{'HUP'} = 'IGNORE';
 
+# initialise the protocol engine
+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); 
+
 # 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
   }
-  process_inqueue();                 # read in lines from the input queue and despatch them
-  DXCommandmode::process();     # process ongoing command mode stuff
-  DXProt::process();              # process ongoing ak1a pcxx stuff
 }