X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=f46ef82d80f20f7ad4f7ef3d19d2685f1ce101ae;hb=84505457c5b3757715d97a63acd792b28fc1841a;hp=f9bc45ffc1d797c80a702048e0107ad76711ef86;hpb=1cf4bd14be226274d5deb05da8480ab91a5dac52;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index f9bc45ff..f46ef82d 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,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
@@ -159,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
@@ -170,7 +183,14 @@ $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);