X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=015fbc9c3e112a473d59099a2349fa3210993abb;hb=21e7642d216656c60b164d76208633a0c81cf5db;hp=8da9fe00ec069578b9e52f102400ad23932a4971;hpb=0121434f428d8e7d1f31a9d69a4ee250b952b468;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 8da9fe00..015fbc9c 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -1,17 +1,21 @@
 #!/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 {
+  unshift @INC, '/spider/perl';  # this IS the right way round!
+  unshift @INC, '/spider/local';
+}
+
 use Msg;
 use DXVars;
 use DXUtil;
@@ -20,6 +24,8 @@ use DXUser;
 use DXM;
 use DXCommandmode;
 use DXProt;
+use DXCluster;
+use DXDebug;
 
 package main;
 
@@ -53,12 +59,37 @@ 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+)\|(.*)$/;
+
+     # 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);
-	 $user = DXUser->new($call) if !defined $user;
-	 $user->sort('U') if (!$user->sort());
-	 my $sort = $user->sort();
-     $dxchan = DXCommandmode->new($call, $conn, $user) if ($sort eq 'U');
-     $dxchan = DXProt->new($call, $conn, $user) if ($sort eq 'A');
+	 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;
   }
   
@@ -98,8 +129,7 @@ sub process_inqueue
   my ($sort, $call, $line) = $data =~ /^(\w)(\S+)\|(.*)$/;
   
   # do the really sexy console interface bit! (Who is going to do the TK interface then?)
-  print DEBUG atime, " <- $sort $call $line\n" if defined DEBUG;
-  print "<- $sort $call $line\n";
+  dbg('chan', "<- $sort $call $line\n");
   
   # handle A records
   my $user = $dxchan->user;
@@ -123,9 +153,11 @@ sub process_inqueue
 #############################################################
 
 # open the debug file, set various FHs to be unbuffered
-open(DEBUG, ">>$debugfn") or die "can't open $debugfn($!)";
-select DEBUG; $| = 1;
-select STDOUT; $| = 1;
+dbginit($debugfn);
+foreach(@debug) {
+  dbgadd($_);
+}
+STDOUT->autoflush(1);
 
 # initialise User file system
 DXUser->init($userfn);
@@ -138,18 +170,23 @@ $SIG{'INT'} = \&cease;
 $SIG{'TERM'} = \&cease;
 $SIG{'HUP'} = 'IGNORE';
 
+# initialise the protocol engine
+DXProt->init();
+
 # this, such as it is, is the main loop!
 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
 }