X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=79c5b5c86300b7622d7bad57288e08c6f5f6d383;hb=07ea293f3919d2da76220b5fbc55b734008ed44c;hp=fc2a0973e6c4a5b2641c0d2a762ede64fc746bd7;hpb=60c0ea1747bc8ad95e531d29025f7bcee4fd10c1;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index fc2a0973..79c5b5c8 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -18,18 +18,24 @@ use DXUtil;
 use DXChannel;
 use DXUser;
 use DXM;
+use DXCommandmode;
+use DXProt;
+use DXCluster;
+use DXDebug;
 
 package main;
 
-@inqueue = ();                # the main input queue, an array of hashes 
+@inqueue = ();                # the main input queue, an array of hashes
+$systime = 0;                 # the time now (in seconds)
 
 # handle disconnections
 sub disconnect
 {
   my $dxchan = shift;
   return if !defined $dxchan;
-  my ($user) = $dxchan->{user};
-  my ($conn) = $dxchan->{conn};
+  my $user = $dxchan->{user};
+  my $conn = $dxchan->{conn};
+  $dxchan->finish();
   $user->close() if defined $user;
   $conn->disconnect() if defined $conn;
   $dxchan->del();
@@ -46,11 +52,46 @@ sub rec
 	return;
   }
   
-  # set up the basic channel info
+  # 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;
-     $dxchan = DXChannel->new($call, $conn, $user);  
+	 if (!defined $user) {
+	   $user = DXUser->new($call);
+	 }
+	 my $sort = $user->sort();
+	 
+	 # 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");
+	   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");
+	   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();
+
+	 # create the channel
+     $dxchan = DXCommandmode->new($call, $conn, $user) if ($sort eq 'U');
+     $dxchan = DXProt->new($call, $conn, $user) if ($sort eq 'A');
+	 die "Invalid sort of user on $call = $sort" if !$dxchan;
   }
   
   # queue the message and the channel object for later processing
@@ -74,6 +115,7 @@ sub cease
   foreach $dxchan (DXChannel->get_all()) {
     disconnect($dxchan);
   }
+  exit(0);
 }
 
 # this is where the input queue is dealt with and things are dispatched off to other parts of
@@ -85,24 +127,23 @@ sub process_inqueue
   
   my $data = $self->{data};
   my $dxchan = $self->{dxchan};
-  my ($sort, $call, $line) = $data =~ /^(\w)(\S+)|(.*)$/;
+  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;
   if ($sort eq 'A') {
-    my $user = $dxchan->{user};
-	$user->{sort} = 'U' if !defined $user->{sort};
-    if ($user->{sort} eq 'U') {
-	  $dxchan->send_later('D', m('l2', $call, $mycall, $myqth));
-	  $dxchan->send_file($motd) if (-e $motd);
-	}
-  } elsif (sort eq 'D') {
-    ;
+    $dxchan->start($line);  
+  } elsif ($sort eq 'D') {
+    die "\$user not defined for $call" if !defined $user;
+	$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";
   }
 }
 
@@ -113,9 +154,11 @@ sub process_inqueue
 #############################################################
 
 # open the debug file, set various FHs to be unbuffered
-open(DEBUG, ">>$debugfn") or die "can't open $debugfn($!)\n";
-select DEBUG; $| = 1;
-select STDOUT; $| = 1;
+dbginit($debugfn);
+foreach(@debug) {
+  dbgadd($_);
+}
+STDOUT->autoflush(1);
 
 # initialise User file system
 DXUser->init($userfn);
@@ -130,7 +173,16 @@ $SIG{'HUP'} = 'IGNORE';
 
 # this, such as it is, is the main loop!
 for (;;) {
+  my $timenow;
   Msg->event_loop(1, 0.001);
-  process_inqueue();
+  $timenow = time;
+  if ($timenow != $systime) {
+    $systime = $timenow;
+	$cldate = &cldate();
+	$ztime = &ztime();
+  }
+  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
 }